Refactoring: Avoid passing data around

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

5 files changed, 70 insertions, 66 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
index d1264996..8eeabd3d 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
@@ -237,7 +237,7 @@ public class CoverageBuilderTest {
 	private void addClass(long id, boolean nomatch, String name, String source,
 			MethodCoverageImpl... methods) {
 		final ClassCoverageImpl coverage = new ClassCoverageImpl(name, id,
-				nomatch, null, "java/lang/Object", new String[0]);
+				nomatch);
 		coverage.setSourceFileName(source);
 		for (MethodCoverageImpl m : methods) {
 			coverage.addMethod(m);
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/BundleCoverageImplTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/BundleCoverageImplTest.java
index 82d3763a..0d0d51f7 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/BundleCoverageImplTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/BundleCoverageImplTest.java
@@ -80,11 +80,9 @@ public class BundleCoverageImplTest {
 
 	@Test
 	public void testGroupByPackage() {
-		ClassCoverageImpl ca = new ClassCoverageImpl("p1/A", 1, false, null,
-				"java/lang/Object", new String[0]);
+		ClassCoverageImpl ca = new ClassCoverageImpl("p1/A", 1, false);
 		ca.setSourceFileName("A.java");
-		ClassCoverageImpl cb = new ClassCoverageImpl("p2/B", 2, false, null,
-				"java/lang/Object", new String[0]);
+		ClassCoverageImpl cb = new ClassCoverageImpl("p2/B", 2, false);
 		cb.setSourceFileName("B.java");
 		ISourceFileCoverage sb = new SourceFileCoverageImpl("B.java", "p2");
 		ISourceFileCoverage sc = new SourceFileCoverageImpl("C.java", "p3");
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java
index 4e66073d..1d3b16d5 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java
@@ -15,9 +15,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Collection;
-
-import org.jacoco.core.analysis.IMethodCoverage;
 import org.jacoco.core.internal.flow.MethodProbesVisitor;
 import org.jacoco.core.internal.instr.InstrSupport;
 import org.junit.Before;
@@ -30,10 +27,12 @@ import org.objectweb.asm.Opcodes;
 public class ClassAnalyzerTest {
 
 	private ClassAnalyzer analyzer;
+	private ClassCoverageImpl coverage;
 
 	@Before
 	public void setup() {
-		analyzer = new ClassAnalyzer(0x0000, false, null, new StringPool());
+		coverage = new ClassCoverageImpl("Foo", 0x0000, false);
+		analyzer = new ClassAnalyzer(coverage, null, new StringPool());
 		analyzer.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC, "Foo", null,
 				"java/lang/Object", null);
 	}
@@ -57,9 +56,7 @@ public class ClassAnalyzerTest {
 		final MethodProbesVisitor mv = analyzer.visitMethod(0, "foo", "()V",
 				null, null);
 		mv.visitEnd();
-		Collection<IMethodCoverage> methods = analyzer.getCoverage()
-				.getMethods();
-		assertEquals(0, methods.size());
+		assertEquals(0, coverage.getMethods().size());
 	}
 
 	@Test
@@ -69,9 +66,7 @@ public class ClassAnalyzerTest {
 		mv.visitCode();
 		mv.visitInsn(Opcodes.RETURN);
 		mv.visitEnd();
-		Collection<IMethodCoverage> methods = analyzer.getCoverage()
-				.getMethods();
-		assertEquals(1, methods.size());
+		assertEquals(1, coverage.getMethods().size());
 	}
 
 	@Test
@@ -79,9 +74,7 @@ public class ClassAnalyzerTest {
 		final MethodProbesVisitor mv = analyzer.visitMethod(
 				Opcodes.ACC_SYNTHETIC, "foo", "()V", null, null);
 		assertNull(mv);
-		Collection<IMethodCoverage> methods = analyzer.getCoverage()
-				.getMethods();
-		assertTrue(methods.isEmpty());
+		assertTrue(coverage.getMethods().isEmpty());
 	}
 
 	@Test
@@ -91,9 +84,7 @@ public class ClassAnalyzerTest {
 		mv.visitCode();
 		mv.visitInsn(Opcodes.RETURN);
 		mv.visitEnd();
-		Collection<IMethodCoverage> methods = analyzer.getCoverage()
-				.getMethods();
-		assertEquals(1, methods.size());
+		assertEquals(1, coverage.getMethods().size());
 	}
 
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassCoverageImplTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassCoverageImplTest.java
index 5235aef7..2c0de6b3 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassCoverageImplTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassCoverageImplTest.java
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.jacoco.core.internal.analysis;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -19,6 +20,7 @@ import java.util.Collections;
 
 import org.jacoco.core.analysis.ICoverageNode;
 import org.jacoco.core.analysis.ISourceNode;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -26,72 +28,88 @@ import org.junit.Test;
  */
 public class ClassCoverageImplTest {
 
+	private ClassCoverageImpl node;
+
+	@Before
+	public void setup() {
+		node = new ClassCoverageImpl("Sample", 12345, false);
+	}
+
+	@Test
+	public void testDefaults() {
+		assertEquals(ICoverageNode.ElementType.CLASS, node.getElementType());
+		assertEquals("Sample", node.getName());
+		assertEquals(12345, node.getId());
+		assertFalse(node.isNoMatch());
+		assertEquals(Collections.emptyList(), node.getMethods());
+	}
+
+	@Test
+	public void testSignature() {
+		node.setSignature("LSample;");
+		assertEquals("LSample;", node.getSignature());
+	}
+
+	@Test
+	public void testSuperName() {
+		node.setSuperName("java/lang/Object");
+		assertEquals("java/lang/Object", node.getSuperName());
+	}
+
+	@Test
+	public void testInterfaces() {
+		node.setInterfaces(new String[] { "A", "B" });
+		assertArrayEquals(new String[] { "A", "B" }, node.getInterfaceNames());
+	}
+
 	@Test
-	public void testProperties() {
-		ClassCoverageImpl data = new ClassCoverageImpl("Sample", 12345, false,
-				"LSample;", "java/lang/Object", new String[0]);
-		data.setSourceFileName("Sample.java");
-		assertEquals(ICoverageNode.ElementType.CLASS, data.getElementType());
-		assertEquals("Sample", data.getName());
-		assertEquals(12345, data.getId());
-		assertFalse(data.isNoMatch());
-		assertEquals("LSample;", data.getSignature());
-		assertEquals("java/lang/Object", data.getSuperName());
-		assertEquals(0, data.getInterfaceNames().length);
-		assertEquals("Sample.java", data.getSourceFileName());
-		assertEquals(Collections.emptyList(), data.getMethods());
+	public void testSourceFileName() {
+		node.setSourceFileName("Sample.java");
+		assertEquals("Sample.java", node.getSourceFileName());
 	}
 
 	@Test
 	public void testNoMatch() {
-		ClassCoverageImpl data = new ClassCoverageImpl("Sample", 12345, true,
-				"LSample;", "java/lang/Object", new String[0]);
-		assertTrue(data.isNoMatch());
+		ClassCoverageImpl node = new ClassCoverageImpl("Sample", 12345, true);
+		assertTrue(node.isNoMatch());
 	}
 
 	@Test
 	public void testGetPackageName1() {
-		ClassCoverageImpl data = new ClassCoverageImpl("ClassInDefaultPackage",
-				0, false, null, "java/lang/Object", new String[0]);
-		assertEquals("", data.getPackageName());
+		ClassCoverageImpl node = new ClassCoverageImpl("ClassInDefaultPackage",
+				0, false);
+		assertEquals("", node.getPackageName());
 	}
 
 	@Test
 	public void testGetPackageName2() {
 		ClassCoverageImpl data = new ClassCoverageImpl(
-				"org/jacoco/examples/Sample", 0, false, null,
-				"java/lang/Object", new String[0]);
+				"org/jacoco/examples/Sample", 0, false);
 		assertEquals("org/jacoco/examples", data.getPackageName());
 	}
 
 	@Test
 	public void testEmptyClass() {
-		ICoverageNode data = new ClassCoverageImpl("Sample", 0, false, null,
-				"java/lang/Object", new String[0]);
-		assertEquals(CounterImpl.COUNTER_0_0, data.getInstructionCounter());
-		assertEquals(CounterImpl.COUNTER_0_0, data.getBranchCounter());
-		assertEquals(CounterImpl.COUNTER_0_0, data.getMethodCounter());
-		assertEquals(CounterImpl.COUNTER_1_0, data.getClassCounter());
+		assertEquals(CounterImpl.COUNTER_0_0, node.getInstructionCounter());
+		assertEquals(CounterImpl.COUNTER_0_0, node.getBranchCounter());
+		assertEquals(CounterImpl.COUNTER_0_0, node.getMethodCounter());
+		assertEquals(CounterImpl.COUNTER_1_0, node.getClassCounter());
 	}
 
 	@Test
 	public void testAddMethodMissed() {
-		ClassCoverageImpl data = new ClassCoverageImpl("Sample", 0, false,
-				null, "java/lang/Object", new String[0]);
-		data.addMethod(createMethod(false));
-		assertEquals(CounterImpl.COUNTER_1_0, data.getInstructionCounter());
-		assertEquals(CounterImpl.COUNTER_1_0, data.getMethodCounter());
-		assertEquals(CounterImpl.COUNTER_1_0, data.getClassCounter());
+		node.addMethod(createMethod(false));
+		assertEquals(CounterImpl.COUNTER_1_0, node.getInstructionCounter());
+		assertEquals(CounterImpl.COUNTER_1_0, node.getMethodCounter());
+		assertEquals(CounterImpl.COUNTER_1_0, node.getClassCounter());
 	}
 
 	@Test
 	public void testAddMethodCovered() {
-		ClassCoverageImpl data = new ClassCoverageImpl("Sample", 0, false,
-				null, "java/lang/Object", new String[0]);
-		data.addMethod(createMethod(true));
-		assertEquals(CounterImpl.COUNTER_0_1, data.getInstructionCounter());
-		assertEquals(CounterImpl.COUNTER_0_1, data.getMethodCounter());
-		assertEquals(CounterImpl.COUNTER_0_1, data.getClassCounter());
+		node.addMethod(createMethod(true));
+		assertEquals(CounterImpl.COUNTER_0_1, node.getInstructionCounter());
+		assertEquals(CounterImpl.COUNTER_0_1, node.getMethodCounter());
+		assertEquals(CounterImpl.COUNTER_0_1, node.getClassCounter());
 	}
 
 	private MethodCoverageImpl createMethod(boolean covered) {
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/PackageCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/PackageCoverageTest.java
index b72f8a76..e11af86d 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/PackageCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/PackageCoverageTest.java
@@ -30,8 +30,7 @@ public class PackageCoverageTest {
 	public void testProperties() {
 		Collection<IClassCoverage> classes = Collections
 				.singleton((IClassCoverage) new ClassCoverageImpl(
-						"org/jacoco/test/Sample", 0, false, null,
-						"java/lang/Object", new String[0]));
+						"org/jacoco/test/Sample", 0, false));
 		Collection<ISourceFileCoverage> sourceFiles = Collections
 				.singleton((ISourceFileCoverage) new SourceFileCoverageImpl(
 						"Sample.java", "org/jacoco/test/Sample"));
@@ -47,8 +46,7 @@ public class PackageCoverageTest {
 	public void testCountersWithSources() {
 		// Classes with source reference will not considered for counters:
 		final ClassCoverageImpl classnode = new ClassCoverageImpl(
-				"org/jacoco/test/Sample", 0, false, null, "java/lang/Object",
-				new String[0]) {
+				"org/jacoco/test/Sample", 0, false) {
 			{
 				classCounter = CounterImpl.getInstance(9, 0);
 				methodCounter = CounterImpl.getInstance(9, 0);
@@ -81,8 +79,7 @@ public class PackageCoverageTest {
 	public void testCountersWithoutSources() {
 		// Classes without source reference will be considered for counters:
 		final ClassCoverageImpl classnode = new ClassCoverageImpl(
-				"org/jacoco/test/Sample", 0, false, null, "java/lang/Object",
-				new String[0]) {
+				"org/jacoco/test/Sample", 0, false) {
 			{
 				classCounter = CounterImpl.getInstance(1, 0);
 				methodCounter = CounterImpl.getInstance(2, 0);