Adding packages as data node.

3 files changed, 74 insertions, 20 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java
index 7739c4aa..ae599c17 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/ClassCoverageTest.java
@@ -13,6 +13,7 @@
 package org.jacoco.core.analysis;

 

 import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

 

 import java.util.ArrayList;

 

@@ -28,29 +29,31 @@ public class ClassCoverageTest {
 

 	@Test

 	public void testProperties() {

-		ClassCoverage data = new ClassCoverage("Sample",

+		ClassCoverage data = new ClassCoverage("Sample", "Sample.java",

 				new ArrayList<MethodCoverage>());

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

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

+		assertEquals("Sample.java", data.getSourceFileName());

+		assertNotNull(data.getLines());

 	}

 

 	@Test

 	public void testGetPackageName1() {

 		ClassCoverage data = new ClassCoverage("ClassInDefaultPackage",

-				new ArrayList<MethodCoverage>());

+				"Sample.java", new ArrayList<MethodCoverage>());

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

 	}

 

 	@Test

 	public void testGetPackageName2() {

 		ClassCoverage data = new ClassCoverage("org/jacoco/examples/Sample",

-				new ArrayList<MethodCoverage>());

+				"Sample.java", new ArrayList<MethodCoverage>());

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

 	}

 

 	@Test

 	public void testEmptyClass() {

-		ICoverageNode data = new ClassCoverage("Sample",

+		ICoverageNode data = new ClassCoverage("Sample", "Sample.java",

 				new ArrayList<MethodCoverage>());

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

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

@@ -67,7 +70,7 @@ public class ClassCoverageTest {
 		final ArrayList<MethodCoverage> methods = new ArrayList<MethodCoverage>();

 		methods.add(createMethod(false));

 		methods.add(createMethod(false));

-		ICoverageNode data = new ClassCoverage("Sample", methods);

+		ICoverageNode data = new ClassCoverage("Sample", "Sample.java", methods);

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

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

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

@@ -83,7 +86,7 @@ public class ClassCoverageTest {
 		final ArrayList<MethodCoverage> methods = new ArrayList<MethodCoverage>();

 		methods.add(createMethod(false));

 		methods.add(createMethod(true));

-		ICoverageNode data = new ClassCoverage("Sample", methods);

+		ICoverageNode data = new ClassCoverage("Sample", "Sample.java", methods);

 		assertEquals(10, 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/CoverageBuilderTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageBuilderTest.java
index 1d6ab2db..c31f18be 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
@@ -15,7 +15,9 @@ package org.jacoco.core.analysis;
 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 

+import java.util.Arrays;

 import java.util.Collection;

+import java.util.Collections;

 import java.util.HashMap;

 import java.util.HashSet;

 import java.util.Map;

@@ -148,32 +150,32 @@ public class CoverageBuilderTest {
 		coverageBuilder.visitClassStructure(2, "org/jacoco/examples/Sample2")

 				.visitEnd();

 		coverageBuilder.visitClassStructure(3, "Sample3").visitEnd();

-		final Collection<ICoverageNode> packages = coverageBuilder

+		final Collection<PackageCoverage> packages = coverageBuilder

 				.getPackages();

 		assertEquals(2, packages.size(), 0.0);

-		Map<String, ICoverageNode> packagesByName = new HashMap<String, ICoverageNode>();

-		for (ICoverageNode p : packages) {

+		Map<String, PackageCoverage> packagesByName = new HashMap<String, PackageCoverage>();

+		for (PackageCoverage p : packages) {

 			packagesByName.put(p.getName(), p);

 		}

 

-		ICoverageNode p1 = packagesByName.get("org/jacoco/examples");

+		PackageCoverage p1 = packagesByName.get("org/jacoco/examples");

 		assertNotNull(p1);

-		// TODO activate once PackageNode is defined

-		// assertEquals(new HashSet<String>(Arrays.asList(

-		// "org/jacoco/examples/Sample1", "org/jacoco/examples/Sample2")),

-		// getNames(p1.getChilden()));

-		//

-		// ICoverageDataNode p2 = packagesByName.get("");

-		// assertNotNull(p2);

-		// assertEquals(Collections.singleton("Sample3"),

-		// getNames(p2.getChilden()));

+		assertEquals(new HashSet<String>(Arrays.asList(

+				"org/jacoco/examples/Sample1", "org/jacoco/examples/Sample2")),

+				getNames(p1.getClasses()));

+

+		PackageCoverage p2 = packagesByName.get("");

+		assertNotNull(p2);

+		assertEquals(Collections.singleton("Sample3"),

+				getNames(p2.getClasses()));

 	}

 

-	private Set<String> getNames(Collection<ICoverageNode> nodes) {

+	private Set<String> getNames(Collection<? extends ICoverageNode> nodes) {

 		Set<String> result = new HashSet<String>();

 		for (ICoverageNode n : nodes) {

 			result.add(n.getName());

 		}

 		return result;

 	}

+

 }

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/PackageCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/PackageCoverageTest.java
new file mode 100644
index 00000000..f180e4fc
--- /dev/null
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/PackageCoverageTest.java
@@ -0,0 +1,49 @@
+/*******************************************************************************

+ * 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 static org.junit.Assert.assertNull;

+

+import java.util.Collection;

+import java.util.Collections;

+

+import org.junit.Test;

+

+/**

+ * Unit test for {@link PackageCoverage}.

+ * 

+ * @author Marc R. Hoffmann

+ * @version $Revision: $

+ */

+public class PackageCoverageTest {

+

+	@Test

+	public void testProperties() {

+		Collection<MethodCoverage> methods = Collections.emptySet();

+		Collection<ClassCoverage> classes = Collections

+				.singleton(new ClassCoverage("org/jacoco/test/Sample",

+						"Sample.java", methods));

+		Collection<SourceFileCoverage> sourceFiles = Collections

+				.singleton(new SourceFileCoverage("Sample.java",

+						"org/jacoco/test/Sample"));

+		PackageCoverage data = new PackageCoverage("org/jacoco/test", classes,

+				sourceFiles);

+		assertEquals(ICoverageNode.ElementType.PACKAGE, data.getElementType());

+		assertEquals("org/jacoco/test", data.getName());

+		assertEquals(classes, data.getClasses());

+		assertEquals(sourceFiles, data.getSourceFiles());

+		assertNull(data.getLines());

+	}

+

+}