Refactoring: Avoid passing data around

Avoid passing too much data around for creation of ClassCoverageImpl
instances.

5 files changed, 9 insertions, 17 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 540e568d..888b97a8 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/ReportStructureTestDriver.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/ReportStructureTestDriver.java
@@ -74,8 +74,7 @@ public class ReportStructureTestDriver {
 		methodCoverage = m;
 
 		final ClassCoverageImpl classCoverageImpl = new ClassCoverageImpl(
-				"org/jacoco/example/FooClass", 1001, false, null,
-				"java/lang/Object", new String[0]);
+				"org/jacoco/example/FooClass", 1001, false);
 		classCoverageImpl.setSourceFileName("FooClass.java");
 		classCoverageImpl.addMethod(methodCoverage);
 		classCoverage = classCoverageImpl;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/check/BundleCheckerTest.java b/org.jacoco.report.test/src/org/jacoco/report/check/BundleCheckerTest.java
index a9d913f5..0dcc99f3 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/check/BundleCheckerTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/check/BundleCheckerTest.java
@@ -134,8 +134,7 @@ public class BundleCheckerTest implements IViolationsOutput {
 		m.incrementMethodCounter();
 
 		final ClassCoverageImpl c = new ClassCoverageImpl(
-				"org/jacoco/example/FooClass", 1001, false, null,
-				"java/lang/Object", new String[0]);
+				"org/jacoco/example/FooClass", 1001, false);
 		c.setSourceFileName("FooClass.java");
 		c.addMethod(m);
 
diff --git a/org.jacoco.report.test/src/org/jacoco/report/csv/ClassRowWriterTest.java b/org.jacoco.report.test/src/org/jacoco/report/csv/ClassRowWriterTest.java
index 7140fde6..6ac33d2c 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/csv/ClassRowWriterTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/csv/ClassRowWriterTest.java
@@ -74,7 +74,7 @@ public class ClassRowWriterTest {
 	@Test
 	public void TestRow() throws Exception {
 		IClassCoverage node = new ClassCoverageImpl("test/package/Foo", 123,
-				false, null, "java/lang/Object", null) {
+				false) {
 			{
 				instructionCounter = CounterImpl.getInstance(1, 11);
 				branchCounter = CounterImpl.getInstance(2, 22);
diff --git a/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/ClassPageTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/ClassPageTest.java
index f892b46b..492ca78d 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/ClassPageTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/ClassPageTest.java
@@ -35,8 +35,7 @@ public class ClassPageTest extends PageTestBase {
 	@Override
 	public void setup() throws Exception {
 		super.setup();
-		node = new ClassCoverageImpl("org/jacoco/example/Foo", 123, false,
-				null, "java/lang/Object", null);
+		node = new ClassCoverageImpl("org/jacoco/example/Foo", 123, false);
 		node.addMethod(new MethodCoverageImpl("a", "()V", null));
 		node.addMethod(new MethodCoverageImpl("b", "()V", null));
 		node.addMethod(new MethodCoverageImpl("c", "()V", null));
@@ -66,8 +65,7 @@ public class ClassPageTest extends PageTestBase {
 
 	@Test
 	public void testGetFileNameDefault() throws IOException {
-		IClassCoverage defaultNode = new ClassCoverageImpl("Foo", 123, false,
-				null, "java/lang/Object", null);
+		IClassCoverage defaultNode = new ClassCoverageImpl("Foo", 123, false);
 		page = new ClassPage(defaultNode, null, null, rootFolder, context);
 		assertEquals("Foo.html", page.getFileName());
 	}
diff --git a/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/PackagePageTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/PackagePageTest.java
index 91cb2cec..e3018bc5 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/PackagePageTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/page/PackagePageTest.java
@@ -59,11 +59,9 @@ public class PackagePageTest extends PageTestBase {
 	@Test
 	public void testContentsWithSource() throws Exception {
 		IClassCoverage class1 = new ClassCoverageImpl(
-				"org/jacoco/example/Foo1", 0x1000, false, null,
-				"java/lang/Object", null);
+				"org/jacoco/example/Foo1", 0x1000, false);
 		IClassCoverage class2 = new ClassCoverageImpl(
-				"org/jacoco/example/Foo2", 0x2000, false, null,
-				"java/lang/Object", null);
+				"org/jacoco/example/Foo2", 0x2000, false);
 		ISourceFileCoverage src1 = new SourceFileCoverageImpl("Src1.java",
 				"org/jacoco/example");
 		node = new PackageCoverageImpl("org/jacoco/example", Arrays.asList(
@@ -96,11 +94,9 @@ public class PackagePageTest extends PageTestBase {
 	@Test
 	public void testContentsNoSource() throws Exception {
 		IClassCoverage class1 = new ClassCoverageImpl(
-				"org/jacoco/example/Foo1", 0x1000, false, null,
-				"java/lang/Object", null);
+				"org/jacoco/example/Foo1", 0x1000, false);
 		IClassCoverage class2 = new ClassCoverageImpl(
-				"org/jacoco/example/Foo2", 0x2000, false, null,
-				"java/lang/Object", null);
+				"org/jacoco/example/Foo2", 0x2000, false);
 		node = new PackageCoverageImpl("org/jacoco/example", Arrays.asList(
 				class1, class2), Collections.<ISourceFileCoverage> emptyList());