diff options
14 files changed, 131 insertions, 128 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); diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/Analyzer.java b/org.jacoco.core/src/org/jacoco/core/analysis/Analyzer.java index 466cdcd3..2da843d4 100644 --- a/org.jacoco.core/src/org/jacoco/core/analysis/Analyzer.java +++ b/org.jacoco.core/src/org/jacoco/core/analysis/Analyzer.java @@ -25,6 +25,7 @@ import org.jacoco.core.data.ExecutionDataStore; import org.jacoco.core.internal.ContentTypeDetector; import org.jacoco.core.internal.Pack200Streams; import org.jacoco.core.internal.analysis.ClassAnalyzer; +import org.jacoco.core.internal.analysis.ClassCoverageImpl; import org.jacoco.core.internal.analysis.StringPool; import org.jacoco.core.internal.data.CRC64; import org.jacoco.core.internal.flow.ClassProbesAdapter; @@ -84,12 +85,14 @@ public class Analyzer { probes = data.getProbes(); noMatch = false; } - final ClassAnalyzer analyzer = new ClassAnalyzer(classid, noMatch, - probes, stringPool) { + final ClassCoverageImpl coverage = new ClassCoverageImpl(className, + classid, noMatch); + final ClassAnalyzer analyzer = new ClassAnalyzer(coverage, probes, + stringPool) { @Override public void visitEnd() { super.visitEnd(); - coverageVisitor.visitCoverage(getCoverage()); + coverageVisitor.visitCoverage(coverage); } }; return new ClassProbesAdapter(analyzer, false); diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java index 14693941..61fe3a01 100644 --- a/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java +++ b/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java @@ -55,7 +55,7 @@ public interface IClassCoverage extends ISourceNode { public String getSuperName(); /** - * Returns the VM names of implemented/extended interfaces + * Returns the VM names of implemented/extended interfaces. * * @return VM names of implemented/extended interfaces */ diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java index 2df27fba..f59457fb 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java @@ -23,56 +23,39 @@ import org.objectweb.asm.Opcodes; */ public class ClassAnalyzer extends ClassProbesVisitor { - private final long classid; - private final boolean noMatch; + private final ClassCoverageImpl coverage; private final boolean[] probes; private final StringPool stringPool; - private ClassCoverageImpl coverage; - /** * Creates a new analyzer that builds coverage data for a class. * - * @param classid - * id of the class - * @param noMatch - * <code>true</code> if class id does not match with execution - * data + * @param coverage + * coverage node for the analyzed class data * @param probes * execution data for this class or <code>null</code> * @param stringPool * shared pool to minimize the number of {@link String} instances */ - public ClassAnalyzer(final long classid, final boolean noMatch, + public ClassAnalyzer(final ClassCoverageImpl coverage, final boolean[] probes, final StringPool stringPool) { - this.classid = classid; - this.noMatch = noMatch; + this.coverage = coverage; this.probes = probes; this.stringPool = stringPool; } - /** - * Returns the coverage data for this class after this visitor has been - * processed. - * - * @return coverage data for this class - */ - public ClassCoverageImpl getCoverage() { - return coverage; - } - @Override public void visit(final int version, final int access, final String name, final String signature, final String superName, final String[] interfaces) { - this.coverage = new ClassCoverageImpl(stringPool.get(name), classid, - noMatch, stringPool.get(signature), stringPool.get(superName), - stringPool.get(interfaces)); + coverage.setSignature(stringPool.get(signature)); + coverage.setSuperName(stringPool.get(superName)); + coverage.setInterfaces(stringPool.get(interfaces)); } @Override public void visitSource(final String source, final String debug) { - this.coverage.setSourceFileName(stringPool.get(source)); + coverage.setSourceFileName(stringPool.get(source)); } @Override diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassCoverageImpl.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassCoverageImpl.java index fe42f5d2..0a806440 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassCoverageImpl.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassCoverageImpl.java @@ -24,38 +24,28 @@ public class ClassCoverageImpl extends SourceNodeImpl implements IClassCoverage private final long id; private final boolean noMatch; - private final String signature; - private final String superName; - private final String[] interfaces; private final Collection<IMethodCoverage> methods; + private String signature; + private String superName; + private String[] interfaces; private String sourceFileName; /** * Creates a class coverage data object with the given parameters. * * @param name - * vm name of the class + * VM name of the class * @param id * class identifier * @param noMatch * <code>true</code>, if class id does not match with execution * data - * @param signature - * vm signature of the class - * @param superName - * vm name of the superclass of this class - * @param interfaces - * vm names of interfaces of this class */ public ClassCoverageImpl(final String name, final long id, - final boolean noMatch, final String signature, - final String superName, final String[] interfaces) { + final boolean noMatch) { super(ElementType.CLASS, name); this.id = id; this.noMatch = noMatch; - this.signature = signature; - this.superName = superName; - this.interfaces = interfaces; this.methods = new ArrayList<IMethodCoverage>(); this.classCounter = CounterImpl.COUNTER_1_0; } @@ -77,6 +67,37 @@ public class ClassCoverageImpl extends SourceNodeImpl implements IClassCoverage } /** + * Sets the VM signature of the class. + * + * @param signature + * VM signature of the class (may be <code>null</code>) + */ + public void setSignature(final String signature) { + this.signature = signature; + } + + /** + * Sets the VM name of the superclass. + * + * @param superName + * VM name of the super class (may be <code>null</code>, i.e. + * <code>java/lang/Object</code>) + */ + public void setSuperName(final String superName) { + this.superName = superName; + } + + /** + * Sets the VM names of implemented/extended interfaces. + * + * @param interfaces + * VM names of implemented/extended interfaces + */ + public void setInterfaces(final String[] interfaces) { + this.interfaces = interfaces; + } + + /** * Sets the name of the corresponding source file for this class. * * @param sourceFileName 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()); |