From ef0204ede88b3e18350208e9afd2381533dfe518 Mon Sep 17 00:00:00 2001 From: "Marc R. Hoffmann" Date: Mon, 9 May 2011 05:48:30 +0000 Subject: Trac #129: JaCoCo core calculates cyclomatic complexity. --- .../src/org/jacoco/report/ReportStructureTestDriver.java | 1 + .../src/org/jacoco/report/csv/CSVFormatterTest.java | 8 ++++---- .../src/org/jacoco/report/csv/CSVGroupHandlerTest.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'org.jacoco.report.test') 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 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 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 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()); } -- cgit v1.2.3