Simplified structure to reduce memory footprint.

8 files changed, 38 insertions, 130 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/BlockCoverageDataTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/BlockCoverageDataTest.java
deleted file mode 100644
index eb50eb7a..00000000
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/BlockCoverageDataTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 Mountainminds GmbH & Co. KG and others

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Marc R. Hoffmann - initial API and implementation

- *    

- * $Id: $

- *******************************************************************************/

-package org.jacoco.core.analysis;

-

-import static org.junit.Assert.assertEquals;

-

-import org.junit.Test;

-

-/**

- * Unit test for {@link BlockNode}.

- * 

- * @author Marc R. Hoffmann

- * @version $Revision: $

- */

-public class BlockCoverageDataTest {

-

-	@Test

-	public void testGetType() {

-		ICoverageDataNode data = new BlockNode(0, new int[0], false);

-		assertEquals(ICoverageDataNode.ElementType.BLOCK, data.getElementType());

-	}

-

-	@Test

-	public void testNotCovered() {

-		ICoverageDataNode data = new BlockNode(15, new int[0], false);

-		assertEquals(15, data.getInstructionCounter().getTotalCount(), 0.0);

-		assertEquals(0, data.getInstructionCounter().getCoveredCount(), 0.0);

-		assertEquals(1, data.getBlockCounter().getTotalCount(), 0.0);

-		assertEquals(0, data.getBlockCounter().getCoveredCount(), 0.0);

-		assertEquals(0, data.getMethodCounter().getTotalCount(), 0.0);

-		assertEquals(0, data.getMethodCounter().getCoveredCount(), 0.0);

-		assertEquals(0, data.getClassCounter().getTotalCount(), 0.0);

-		assertEquals(0, data.getClassCounter().getCoveredCount(), 0.0);

-	}

-

-	@Test

-	public void testCovered() {

-		ICoverageDataNode data = new BlockNode(15, new int[0], true);

-		assertEquals(15, data.getInstructionCounter().getTotalCount(), 0.0);

-		assertEquals(15, data.getInstructionCounter().getCoveredCount(), 0.0);

-		assertEquals(1, data.getBlockCounter().getTotalCount(), 0.0);

-		assertEquals(1, data.getBlockCounter().getCoveredCount(), 0.0);

-		assertEquals(0, data.getMethodCounter().getTotalCount(), 0.0);

-		assertEquals(0, data.getMethodCounter().getCoveredCount(), 0.0);

-		assertEquals(0, data.getClassCounter().getTotalCount(), 0.0);

-		assertEquals(0, data.getClassCounter().getCoveredCount(), 0.0);

-	}

-

-}

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageDataTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageDataTest.java
index 5b77d051..6ff84d07 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageDataTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageDataTest.java
@@ -28,31 +28,29 @@ public class ClassCoverageDataTest {
 

 	@Test

 	public void testProperties() {

-		ClassNode data = new ClassNode("Sample", "testbundle",

+		ClassNode data = new ClassNode("Sample",

 				new ArrayList<ICoverageDataNode>());

 		assertEquals(ICoverageDataNode.ElementType.CLASS, data.getElementType());

 		assertEquals("Sample", data.getName());

-		assertEquals("testbundle", data.getBundle());

 	}

 

 	@Test

 	public void testGetPackageName1() {

 		ClassNode data = new ClassNode("ClassInDefaultPackage",

-				"testbundle", new ArrayList<ICoverageDataNode>());

+				new ArrayList<ICoverageDataNode>());

 		assertEquals("", data.getPackagename());

 	}

 

 	@Test

 	public void testGetPackageName2() {

-		ClassNode data = new ClassNode(

-				"org/jacoco/examples/Sample", "testbundle",

+		ClassNode data = new ClassNode("org/jacoco/examples/Sample",

 				new ArrayList<ICoverageDataNode>());

 		assertEquals("org/jacoco/examples", data.getPackagename());

 	}

 

 	@Test

 	public void testEmptyClass() {

-		ICoverageDataNode data = new ClassNode("Sample", null,

+		ICoverageDataNode data = new ClassNode("Sample",

 				new ArrayList<ICoverageDataNode>());

 		assertEquals(0, data.getInstructionCounter().getTotalCount(), 0.0);

 		assertEquals(0, data.getInstructionCounter().getCoveredCount(), 0.0);

@@ -69,7 +67,7 @@ public class ClassCoverageDataTest {
 		final ArrayList<ICoverageDataNode> methods = new ArrayList<ICoverageDataNode>();

 		methods.add(createMethod(false));

 		methods.add(createMethod(false));

-		ICoverageDataNode data = new ClassNode("Sample", null, methods);

+		ICoverageDataNode data = new ClassNode("Sample", methods);

 		assertEquals(10, data.getInstructionCounter().getTotalCount(), 0.0);

 		assertEquals(0, data.getInstructionCounter().getCoveredCount(), 0.0);

 		assertEquals(2, data.getBlockCounter().getTotalCount(), 0.0);

@@ -85,7 +83,7 @@ public class ClassCoverageDataTest {
 		final ArrayList<ICoverageDataNode> methods = new ArrayList<ICoverageDataNode>();

 		methods.add(createMethod(false));

 		methods.add(createMethod(true));

-		ICoverageDataNode data = new ClassNode("Sample", null, methods);

+		ICoverageDataNode data = new ClassNode("Sample", methods);

 		assertEquals(10, data.getInstructionCounter().getTotalCount(), 0.0);

 		assertEquals(5, data.getInstructionCounter().getCoveredCount(), 0.0);

 		assertEquals(2, data.getBlockCounter().getTotalCount(), 0.0);

@@ -97,9 +95,9 @@ public class ClassCoverageDataTest {
 	}

 

 	private ICoverageDataNode createMethod(boolean covered) {

-		final ArrayList<ICoverageDataNode> blocks = new ArrayList<ICoverageDataNode>();

-		blocks.add(new BlockNode(5, new int[0], covered));

-		return new MethodNode("sample", "()V", null, blocks);

+		final MethodNode m = new MethodNode("sample", "()V", null);

+		m.addBlock(5, new int[0], covered);

+		return m;

 	}

 

 }

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 c3348985..8e91c4a9 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
@@ -43,8 +43,7 @@ public class CoverageBuilderTest {
 	@Test

 	public void testCreateClassNotCovered() {

 		final IClassStructureOutput classStructure = coverageBuilder

-				.classStructure(123L, "org/jacoco/examples/Sample",

-						"testbundle");

+				.classStructure(123L, "org/jacoco/examples/Sample");

 		final IMethodStructureOutput methodStructure = classStructure

 				.methodStructure(0, "doit", "()V", null);

 		methodStructure.block(0, 5, new int[] { 6, 7, 8 });

@@ -55,7 +54,6 @@ public class CoverageBuilderTest {
 		assertEquals(1, classes.size(), 1.0);

 		ClassNode c = classes.iterator().next();

 		assertEquals("org/jacoco/examples/Sample", c.getName());

-		assertEquals("testbundle", c.getBundle());

 		assertEquals(1, c.getClassCounter().getTotalCount(), 0.0);

 		assertEquals(0, c.getClassCounter().getCoveredCount(), 0.0);

 		assertEquals(1, c.getMethodCounter().getTotalCount(), 0.0);

@@ -76,14 +74,6 @@ public class CoverageBuilderTest {
 		assertEquals(0, m.getBlockCounter().getCoveredCount(), 0.0);

 		assertEquals(3, m.getLineCounter().getTotalCount(), 0.0);

 		assertEquals(0, m.getLineCounter().getCoveredCount(), 0.0);

-

-		final Collection<ICoverageDataNode> blocks = m.getChilden();

-		assertEquals(1, blocks.size(), 1.0);

-		ICoverageDataNode b = blocks.iterator().next();

-		assertEquals(1, b.getBlockCounter().getTotalCount(), 0.0);

-		assertEquals(0, b.getBlockCounter().getCoveredCount(), 0.0);

-		assertEquals(3, b.getLineCounter().getTotalCount(), 0.0);

-		assertEquals(0, b.getLineCounter().getCoveredCount(), 0.0);

 	}

 

 	@Test

@@ -91,8 +81,7 @@ public class CoverageBuilderTest {
 		executionData.classExecution(123L,

 				new boolean[][] { new boolean[] { true } });

 		final IClassStructureOutput classStructure = coverageBuilder

-				.classStructure(123L, "org/jacoco/examples/Sample",

-						"testbundle");

+				.classStructure(123L, "org/jacoco/examples/Sample");

 		final IMethodStructureOutput methodStructure = classStructure

 				.methodStructure(0, "doit", "()V", null);

 		methodStructure.block(0, 5, new int[] { 6, 7, 8 });

@@ -103,7 +92,6 @@ public class CoverageBuilderTest {
 		assertEquals(1, classes.size(), 1.0);

 		ClassNode c = classes.iterator().next();

 		assertEquals("org/jacoco/examples/Sample", c.getName());

-		assertEquals("testbundle", c.getBundle());

 		assertEquals(1, c.getClassCounter().getTotalCount(), 0.0);

 		assertEquals(1, c.getClassCounter().getCoveredCount(), 0.0);

 		assertEquals(1, c.getMethodCounter().getTotalCount(), 0.0);

@@ -124,27 +112,17 @@ public class CoverageBuilderTest {
 		assertEquals(1, m.getBlockCounter().getCoveredCount(), 0.0);

 		assertEquals(3, m.getLineCounter().getTotalCount(), 0.0);

 		assertEquals(3, m.getLineCounter().getCoveredCount(), 0.0);

-

-		final Collection<ICoverageDataNode> blocks = m.getChilden();

-		assertEquals(1, blocks.size(), 1.0);

-		ICoverageDataNode b = blocks.iterator().next();

-		assertEquals(1, b.getBlockCounter().getTotalCount(), 0.0);

-		assertEquals(1, b.getBlockCounter().getCoveredCount(), 0.0);

-		assertEquals(3, b.getLineCounter().getTotalCount(), 0.0);

-		assertEquals(3, b.getLineCounter().getCoveredCount(), 0.0);

 	}

 

 	@Test

 	public void testCreateSourceFile() {

 		final IClassStructureOutput classStructure1 = coverageBuilder

-				.classStructure(123L, "org/jacoco/examples/Sample",

-						"testbundle");

+				.classStructure(123L, "org/jacoco/examples/Sample");

 		classStructure1.sourceFile("Sample.java");

 		classStructure1.end();

 

 		final IClassStructureOutput classStructure2 = coverageBuilder

-				.classStructure(123L, "org/jacoco/examples/Sample",

-						"testbundle");

+				.classStructure(123L, "org/jacoco/examples/Sample");

 		classStructure2.sourceFile("Sample.java");

 		classStructure2.end();

 

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageDataNodeImplTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageDataNodeImplTest.java
index 7913caff..515c3299 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageDataNodeImplTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageDataNodeImplTest.java
@@ -34,8 +34,9 @@ public class CoverageDataNodeImplTest {
 	@Test

 	public void testInit1() {

 		ICoverageDataNode node = new CoverageDataNodeImpl(ElementType.CLASS,

-				false);

+				"myname", false);

 		assertEquals(ElementType.CLASS, node.getElementType());

+		assertEquals("myname", node.getName());

 		assertTrue(node.getChilden().isEmpty());

 		assertEquals(0, node.getBlockCounter().getTotalCount(), 0.0);

 		assertEquals(0, node.getBlockCounter().getCoveredCount(), 0.0);

@@ -53,8 +54,9 @@ public class CoverageDataNodeImplTest {
 	@Test

 	public void testInit2() {

 		ICoverageDataNode node = new CoverageDataNodeImpl(ElementType.CLASS,

-				true);

+				"myname", true);

 		assertEquals(ElementType.CLASS, node.getElementType());

+		assertEquals("myname", node.getName());

 		assertTrue(node.getChilden().isEmpty());

 		assertEquals(0, node.getBlockCounter().getTotalCount(), 0.0);

 		assertEquals(0, node.getBlockCounter().getCoveredCount(), 0.0);

@@ -73,9 +75,9 @@ public class CoverageDataNodeImplTest {
 	@Test

 	public void testAdd1() {

 		CoverageDataNodeImpl node = new CoverageDataNodeImpl(

-				ElementType.CUSTOM, false);

+				ElementType.CUSTOM, "myname", false);

 		ICoverageDataNode child = new CoverageDataNodeImpl(ElementType.CLASS,

-				true) {

+				"myname", true) {

 			{

 				instructionCounter = CounterImpl.getInstance(42, 41);

 				blockCounter = CounterImpl.getInstance(32, 31);

@@ -102,9 +104,9 @@ public class CoverageDataNodeImplTest {
 	@Test

 	public void testAdd() {

 		CoverageDataNodeImpl node = new CoverageDataNodeImpl(

-				ElementType.CUSTOM, true);

+				ElementType.CUSTOM, "myname", true);

 		ICoverageDataNode child = new CoverageDataNodeImpl(ElementType.CLASS,

-				true) {

+				"myname", true) {

 			{

 				instructionCounter = CounterImpl.getInstance(42, 41);

 				blockCounter = CounterImpl.getInstance(32, 31);

@@ -135,11 +137,11 @@ public class CoverageDataNodeImplTest {
 	@Test

 	public void testAddAll() {

 		CoverageDataNodeImpl node = new CoverageDataNodeImpl(

-				ElementType.CUSTOM, false);

+				ElementType.CUSTOM, "myname", false);

 		ICoverageDataNode child1 = new CoverageDataNodeImpl(ElementType.CLASS,

-				false);

+				"myname", false);

 		ICoverageDataNode child2 = new CoverageDataNodeImpl(ElementType.CLASS,

-				false);

+				"myname", false);

 		final List<ICoverageDataNode> chidren = Arrays

 				.asList(new ICoverageDataNode[] { child1, child2 });

 		node.addAll(chidren);

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageDataTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageDataTest.java
index 6c2674e2..982cfcc1 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageDataTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageDataTest.java
@@ -14,8 +14,6 @@ package org.jacoco.core.analysis;
 

 import static org.junit.Assert.assertEquals;

 

-import java.util.ArrayList;

-

 import org.junit.Test;

 

 /**

@@ -29,11 +27,10 @@ public class MethodCoverageDataTest {
 	@Test

 	public void testProperties() {

 		// Example: java.util.Collections.emptySet()

-		MethodNode data = new MethodNode("emptySet",

-				"()Ljava/util/Set;",

-				"<T:Ljava/lang/Object;>()Ljava/util/Set<TT;>;",

-				new ArrayList<ICoverageDataNode>());

-		assertEquals(ICoverageDataNode.ElementType.METHOD, data.getElementType());

+		MethodNode data = new MethodNode("emptySet", "()Ljava/util/Set;",

+				"<T:Ljava/lang/Object;>()Ljava/util/Set<TT;>;");

+		assertEquals(ICoverageDataNode.ElementType.METHOD, data

+				.getElementType());

 		assertEquals("emptySet", data.getName());

 		assertEquals("()Ljava/util/Set;", data.getDesc());

 		assertEquals("<T:Ljava/lang/Object;>()Ljava/util/Set<TT;>;", data

@@ -42,8 +39,7 @@ public class MethodCoverageDataTest {
 

 	@Test

 	public void testEmptyMethod() {

-		ICoverageDataNode data = new MethodNode("sample", "()V", null,

-				new ArrayList<ICoverageDataNode>());

+		ICoverageDataNode data = new MethodNode("sample", "()V", null);

 		assertEquals(0, data.getInstructionCounter().getTotalCount(), 0.0);

 		assertEquals(0, data.getInstructionCounter().getCoveredCount(), 0.0);

 		assertEquals(0, data.getBlockCounter().getTotalCount(), 0.0);

@@ -56,11 +52,9 @@ public class MethodCoverageDataTest {
 

 	@Test

 	public void testNotCovered() {

-		final ArrayList<ICoverageDataNode> blocks = new ArrayList<ICoverageDataNode>();

-		blocks.add(new BlockNode(5, new int[0], false));

-		blocks.add(new BlockNode(8, new int[0], false));

-		ICoverageDataNode data = new MethodNode("sample", "()V", null,

-				blocks);

+		MethodNode data = new MethodNode("sample", "()V", null);

+		data.addBlock(5, new int[0], false);

+		data.addBlock(8, new int[0], false);

 		assertEquals(13, data.getInstructionCounter().getTotalCount(), 0.0);

 		assertEquals(0, data.getInstructionCounter().getCoveredCount(), 0.0);

 		assertEquals(2, data.getBlockCounter().getTotalCount(), 0.0);

@@ -73,11 +67,9 @@ public class MethodCoverageDataTest {
 

 	@Test

 	public void testCovered() {

-		final ArrayList<ICoverageDataNode> blocks = new ArrayList<ICoverageDataNode>();

-		blocks.add(new BlockNode(5, new int[0], true));

-		blocks.add(new BlockNode(8, new int[0], false));

-		ICoverageDataNode data = new MethodNode("sample", "()V", null,

-				blocks);

+		MethodNode data = new MethodNode("sample", "()V", null);

+		data.addBlock(5, new int[0], true);

+		data.addBlock(8, new int[0], false);

 		assertEquals(13, data.getInstructionCounter().getTotalCount(), 0.0);

 		assertEquals(5, data.getInstructionCounter().getCoveredCount(), 0.0);

 		assertEquals(2, data.getBlockCounter().getTotalCount(), 0.0);

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/SourceFileCoverageDataTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/SourceFileCoverageDataTest.java
index 11373de5..00c80a50 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/SourceFileCoverageDataTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/SourceFileCoverageDataTest.java
@@ -27,12 +27,10 @@ public class SourceFileCoverageDataTest {
 	@Test

 	public void testProperties() {

 		SourceFileNode data = new SourceFileNode("Sample.java",

-				"org/jacoco/examples", "samples");

+				"org/jacoco/examples");

 		assertEquals(ICoverageDataNode.ElementType.SOURCEFILE, data

 				.getElementType());

-		assertEquals("Sample.java", data.getFilename());

 		assertEquals("org/jacoco/examples", data.getPackagename());

-		assertEquals("samples", data.getBundle());

 	}

 

 }

diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java b/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java
index b5786a7d..5f3d69fd 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/ClassDataRecorder.java
@@ -130,8 +130,7 @@ class ClassDataRecorder implements IExecutionDataOutput, IStructureOutput,
 

 	// === IStructureOutput ===

 

-	public IClassStructureOutput classStructure(long id, String name,

-			String bundle) {

+	public IClassStructureOutput classStructure(long id, String name) {

 		assertTrue("Recorder can be used for a single class only.", id != -1);

 		classid = id;

 		return this;

diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/InstrumentationScenariosTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/InstrumentationScenariosTest.java
index 4159a9f7..c1f98866 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/InstrumentationScenariosTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/InstrumentationScenariosTest.java
@@ -110,7 +110,7 @@ public class InstrumentationScenariosTest {
 

 		final ClassDataRecorder rec = new ClassDataRecorder();

 		final Analyzer analyzer = new Analyzer(rec);

-		analyzer.analyze(reader, null);

+		analyzer.analyze(reader);

 

 		final Instrumenter instr = new Instrumenter(runtime);

 		final byte[] instrumentedBuffer = instr.instrument(reader);