diff options
| author | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2011-05-09 05:48:30 +0000 |
|---|---|---|
| committer | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2011-05-09 05:48:30 +0000 |
| commit | ef0204ede88b3e18350208e9afd2381533dfe518 (patch) | |
| tree | 5f287b873b7256723578a83a1bbb521fb62bd94b /org.jacoco.report.test | |
| parent | 42aa4a1a85614debd253adf7f645d6ad8a3920b3 (diff) | |
| download | jacoco-ef0204ede88b3e18350208e9afd2381533dfe518.tar.gz | |
Trac #129: JaCoCo core calculates cyclomatic complexity.
Diffstat (limited to 'org.jacoco.report.test')
3 files changed, 7 insertions, 6 deletions
diff --git a/org.jacoco.report.test/src/org/jacoco/report/ReportStructureTestDriver.java b/org.jacoco.report.test/src/org/jacoco/report/ReportStructureTestDriver.java index 7369eec8..e3cff089 100644 --- a/org.jacoco.report.test/src/org/jacoco/report/ReportStructureTestDriver.java +++ b/org.jacoco.report.test/src/org/jacoco/report/ReportStructureTestDriver.java @@ -68,6 +68,7 @@ public class ReportStructureTestDriver { { instructionCounter = CounterImpl.getInstance(2, 22); branchCounter = CounterImpl.getInstance(3, 33); + methodCounter = CounterImpl.COUNTER_0_1; } }; diff --git a/org.jacoco.report.test/src/org/jacoco/report/csv/CSVFormatterTest.java b/org.jacoco.report.test/src/org/jacoco/report/csv/CSVFormatterTest.java index d280ddae..212df80a 100644 --- a/org.jacoco.report.test/src/org/jacoco/report/csv/CSVFormatterTest.java +++ b/org.jacoco.report.test/src/org/jacoco/report/csv/CSVFormatterTest.java @@ -67,7 +67,7 @@ public class CSVFormatterTest { final List<String> lines = getLines(); assertEquals(HEADER, lines.get(0)); assertEquals( - "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,1,0", + "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,0,1", lines.get(1)); } @@ -82,10 +82,10 @@ public class CSVFormatterTest { final List<String> lines = getLines(); assertEquals(HEADER, lines.get(0)); assertEquals( - "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,1,0", + "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,0,1", lines.get(1)); assertEquals( - "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,1,0", + "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,0,1", lines.get(2)); } @@ -94,7 +94,7 @@ public class CSVFormatterTest { driver.sendBundle(visitor); final List<String> lines = getLines(); assertEquals(HEADER, lines.get(0)); - assertEquals("bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,1,0", + assertEquals("bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,0,1", lines.get(1)); } diff --git a/org.jacoco.report.test/src/org/jacoco/report/csv/CSVGroupHandlerTest.java b/org.jacoco.report.test/src/org/jacoco/report/csv/CSVGroupHandlerTest.java index 74c01cdc..28378301 100644 --- a/org.jacoco.report.test/src/org/jacoco/report/csv/CSVGroupHandlerTest.java +++ b/org.jacoco.report.test/src/org/jacoco/report/csv/CSVGroupHandlerTest.java @@ -48,7 +48,7 @@ public class CSVGroupHandlerTest { driver.sendBundle(handler);
final BufferedReader reader = getResultReader();
reader.readLine();
- assertEquals("bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,1,0",
+ assertEquals("bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,0,1",
reader.readLine());
}
@@ -58,7 +58,7 @@ public class CSVGroupHandlerTest { final BufferedReader reader = getResultReader();
reader.readLine();
assertEquals(
- "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,1,0",
+ "group/bundle,org.jacoco.example,FooClass,2,22,3,33,0,0,0,1",
reader.readLine());
}
|