Track #66: replace block counter with branch counter

9 files changed, 79 insertions, 57 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/BundleCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/BundleCoverageTest.java
index c4717d4c..df01a472 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/BundleCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/BundleCoverageTest.java
@@ -51,7 +51,7 @@ public class BundleCoverageTest {
 			{

 				classCounter = CounterImpl.getInstance(1, 0);

 				methodCounter = CounterImpl.getInstance(2, 0);

-				blockCounter = CounterImpl.getInstance(3, 0);

+				branchCounter = CounterImpl.getInstance(3, 0);

 				instructionCounter = CounterImpl.getInstance(4, 0);

 				lineCounter = CounterImpl.getInstance(5, 0);

 			}

@@ -61,7 +61,7 @@ public class BundleCoverageTest {
 			{

 				classCounter = CounterImpl.getInstance(1, 0);

 				methodCounter = CounterImpl.getInstance(2, 0);

-				blockCounter = CounterImpl.getInstance(3, 0);

+				branchCounter = CounterImpl.getInstance(3, 0);

 				instructionCounter = CounterImpl.getInstance(4, 0);

 				lineCounter = CounterImpl.getInstance(5, 0);

 			}

@@ -70,9 +70,9 @@ public class BundleCoverageTest {
 				p1, p2));

 		assertEquals(CounterImpl.getInstance(2, 0), bundle.getClassCounter());

 		assertEquals(CounterImpl.getInstance(4, 0), bundle.getMethodCounter());

-		assertEquals(CounterImpl.getInstance(6, 0), bundle.getBlockCounter());

-		assertEquals(CounterImpl.getInstance(8, 0), bundle

-				.getInstructionCounter());

+		assertEquals(CounterImpl.getInstance(6, 0), bundle.getBranchCounter());

+		assertEquals(CounterImpl.getInstance(8, 0),

+				bundle.getInstructionCounter());

 		assertEquals(CounterImpl.getInstance(10, 0), bundle.getLineCounter());

 	}

 

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 2839e26e..0b207277 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
@@ -63,14 +63,10 @@ public class ClassCoverageTest {
 		ICoverageNode data = new ClassCoverage("Sample", 0, null,

 				"java/lang/Object", new String[0], "Sample.java",

 				new ArrayList<MethodCoverage>());

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

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

-		assertEquals(0, 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(1, data.getClassCounter().getTotalCount(), 0.0);

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

+		assertEquals(CounterImpl.COUNTER_0_0, data.getInstructionCounter());

+		assertEquals(CounterImpl.COUNTER_0_0, data.getBranchCounter());

+		assertEquals(CounterImpl.COUNTER_0_0, data.getMethodCounter());

+		assertEquals(CounterImpl.getInstance(false), data.getClassCounter());

 	}

 

 	@Test

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java
index 4fc5b7f3..38bb4677 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/CounterComparatorTest.java
@@ -82,7 +82,7 @@ public class CounterComparatorTest {
 		ICoverageNode d1 = new MockBlockData(18);

 		ICoverageNode d2 = new MockBlockData(15);

 		final Comparator<ICoverageNode> cmp = CounterComparator.TOTALITEMS

-				.on(CounterEntity.BLOCK);

+				.on(CounterEntity.INSTRUCTION);

 		assertTrue(cmp.compare(d1, d2) > 0);

 	}

 

@@ -97,8 +97,8 @@ public class CounterComparatorTest {
 

 	private void assertCmpEquals(Comparator<ICounter> cmp, int total1,

 			int covered1, int total2, int covered2) {

-		assertEquals(0, cmp.compare(ctr(total1, covered1),

-				ctr(total2, covered2)), 0.0);

+		assertEquals(0,

+				cmp.compare(ctr(total1, covered1), ctr(total2, covered2)), 0.0);

 	}

 

 	private void assertCmpLess(Comparator<ICounter> cmp, int total1,

@@ -118,7 +118,7 @@ public class CounterComparatorTest {
 	private static final class MockBlockData extends CoverageNodeImpl {

 		MockBlockData(int total) {

 			super(GROUP, "mock", false);

-			blockCounter = CounterImpl.getInstance(total, false);

+			instructionCounter = CounterImpl.getInstance(total, false);

 		}

 	}

 

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageNodeImplTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageNodeImplTest.java
index f740aa09..c17ac2fa 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageNodeImplTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/CoverageNodeImplTest.java
@@ -11,7 +11,7 @@
  *******************************************************************************/

 package org.jacoco.core.analysis;

 

-import static org.jacoco.core.analysis.ICoverageNode.CounterEntity.BLOCK;

+import static org.jacoco.core.analysis.ICoverageNode.CounterEntity.BRANCH;

 import static org.jacoco.core.analysis.ICoverageNode.CounterEntity.CLASS;

 import static org.jacoco.core.analysis.ICoverageNode.CounterEntity.INSTRUCTION;

 import static org.jacoco.core.analysis.ICoverageNode.CounterEntity.LINE;

@@ -45,7 +45,7 @@ public class CoverageNodeImplTest {
 	public void testInitWithoutLines() {

 		ICoverageNode node = new CoverageNodeImpl(ElementType.GROUP, "sample",

 				false);

-		assertEquals(CounterImpl.COUNTER_0_0, node.getBlockCounter());

+		assertEquals(CounterImpl.COUNTER_0_0, node.getBranchCounter());

 		assertEquals(CounterImpl.COUNTER_0_0, node.getInstructionCounter());

 		assertEquals(CounterImpl.COUNTER_0_0, node.getLineCounter());

 		assertEquals(CounterImpl.COUNTER_0_0, node.getMethodCounter());

@@ -57,7 +57,7 @@ public class CoverageNodeImplTest {
 	public void testInitWithLines() {

 		ICoverageNode node = new CoverageNodeImpl(ElementType.CLASS, "Sample",

 				true);

-		assertEquals(CounterImpl.COUNTER_0_0, node.getBlockCounter());

+		assertEquals(CounterImpl.COUNTER_0_0, node.getBranchCounter());

 		assertEquals(CounterImpl.COUNTER_0_0, node.getInstructionCounter());

 		assertEquals(CounterImpl.COUNTER_0_0, node.getLineCounter());

 		assertEquals(CounterImpl.COUNTER_0_0, node.getMethodCounter());

@@ -73,7 +73,7 @@ public class CoverageNodeImplTest {
 				false) {

 			{

 				instructionCounter = CounterImpl.getInstance(42, 41);

-				blockCounter = CounterImpl.getInstance(32, 31);

+				branchCounter = CounterImpl.getInstance(25, 15);

 				lineCounter = CounterImpl.getInstance(8, 3);

 				methodCounter = CounterImpl.getInstance(22, 21);

 				classCounter = CounterImpl.getInstance(12, 11);

@@ -84,8 +84,8 @@ public class CoverageNodeImplTest {
 				parent.getCounter(INSTRUCTION));

 		assertEquals(CounterImpl.getInstance(42, 41),

 				parent.getInstructionCounter());

-		assertEquals(CounterImpl.getInstance(32, 31), parent.getCounter(BLOCK));

-		assertEquals(CounterImpl.getInstance(32, 31), parent.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(25, 15), parent.getCounter(BRANCH));

+		assertEquals(CounterImpl.getInstance(25, 15), parent.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(8, 3), parent.getCounter(LINE));

 		assertEquals(CounterImpl.getInstance(8, 3), parent.getLineCounter());

 		assertEquals(CounterImpl.getInstance(22, 21), parent.getCounter(METHOD));

@@ -102,7 +102,7 @@ public class CoverageNodeImplTest {
 				true) {

 			{

 				instructionCounter = CounterImpl.getInstance(42, 41);

-				blockCounter = CounterImpl.getInstance(32, 31);

+				branchCounter = CounterImpl.getInstance(25, 15);

 				lines.increment(1, false);

 				lines.increment(2, false);

 				lines.increment(3, true);

@@ -114,7 +114,7 @@ public class CoverageNodeImplTest {
 		node.increment(child);

 		assertEquals(CounterImpl.getInstance(42, 41),

 				node.getInstructionCounter());

-		assertEquals(CounterImpl.getInstance(32, 31), node.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(25, 15), node.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(22, 21), node.getMethodCounter());

 		assertEquals(CounterImpl.getInstance(12, 11), node.getClassCounter());

 		assertEquals(CounterImpl.getInstance(4, 2), node.getLineCounter());

@@ -131,17 +131,17 @@ public class CoverageNodeImplTest {
 		ICoverageNode child1 = new CoverageNodeImpl(ElementType.GROUP,

 				"sample", false) {

 			{

-				blockCounter = CounterImpl.getInstance(5, 2);

+				branchCounter = CounterImpl.getInstance(5, 2);

 			}

 		};

 		ICoverageNode child2 = new CoverageNodeImpl(ElementType.GROUP,

 				"sample", false) {

 			{

-				blockCounter = CounterImpl.getInstance(3, 3);

+				branchCounter = CounterImpl.getInstance(3, 3);

 			}

 		};

 		parent.increment(Arrays.asList(child1, child2));

-		assertEquals(CounterImpl.getInstance(8, 5), parent.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(8, 5), parent.getBranchCounter());

 	}

 

 	@Test

@@ -151,7 +151,7 @@ public class CoverageNodeImplTest {
 			{

 				classCounter = CounterImpl.getInstance(1, 1);

 				methodCounter = CounterImpl.getInstance(2, 2);

-				blockCounter = CounterImpl.getInstance(3, 3);

+				branchCounter = CounterImpl.getInstance(3, 3);

 				instructionCounter = CounterImpl.getInstance(4, 4);

 				lines.increment(1, true);

 				lines.increment(2, true);

@@ -165,7 +165,7 @@ public class CoverageNodeImplTest {
 		assertEquals("sample", copy.getName());

 		assertEquals(CounterImpl.getInstance(1, 1), copy.getClassCounter());

 		assertEquals(CounterImpl.getInstance(2, 2), copy.getMethodCounter());

-		assertEquals(CounterImpl.getInstance(3, 3), copy.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(3, 3), copy.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(4, 4),

 				copy.getInstructionCounter());

 		assertEquals(CounterImpl.getInstance(5, 5), copy.getLineCounter());

@@ -181,7 +181,7 @@ public class CoverageNodeImplTest {
 			{

 				classCounter = CounterImpl.getInstance(1, 1);

 				methodCounter = CounterImpl.getInstance(2, 2);

-				blockCounter = CounterImpl.getInstance(3, 3);

+				branchCounter = CounterImpl.getInstance(3, 3);

 				instructionCounter = CounterImpl.getInstance(4, 4);

 				lineCounter = CounterImpl.getInstance(5, 5);

 			}

@@ -191,7 +191,7 @@ public class CoverageNodeImplTest {
 		assertEquals("Sample", copy.getName());

 		assertEquals(CounterImpl.getInstance(1, 1), copy.getClassCounter());

 		assertEquals(CounterImpl.getInstance(2, 2), copy.getMethodCounter());

-		assertEquals(CounterImpl.getInstance(3, 3), copy.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(3, 3), copy.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(4, 4),

 				copy.getInstructionCounter());

 		assertEquals(CounterImpl.getInstance(5, 5), copy.getLineCounter());

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodAnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodAnalyzerTest.java
index b8f9a3a0..05bda512 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodAnalyzerTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodAnalyzerTest.java
@@ -17,7 +17,6 @@ import static junit.framework.Assert.assertTrue;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jacoco.core.analysis.MethodAnalyzer;
 import org.jacoco.core.data.IMethodStructureVisitor;
 import org.jacoco.core.internal.flow.IProbeIdGenerator;
 import org.jacoco.core.internal.flow.LabelFlowAnalyzer;
@@ -464,8 +463,8 @@ public class MethodAnalyzerTest implements IProbeIdGenerator {
 				getLine(line).addInsn(covered);
 			}
 
-			public void visitBranches(int missed, int covered, int line) {
-				getLine(line).addBranches(missed, covered);
+			public void visitBranches(int total, int covered, int line) {
+				getLine(line).addBranches(total - covered, covered);
 			}
 
 			public void visitEnd() {
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java
index 0c1706b8..19d00295 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/MethodCoverageTest.java
@@ -44,12 +44,13 @@ public class MethodCoverageTest {
 		assertEquals(CounterImpl.getInstance(0, 0), data.getLineCounter());

 		assertEquals(CounterImpl.getInstance(0, 0),

 				data.getInstructionCounter());

+		assertEquals(CounterImpl.getInstance(0, 0), data.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(1, 0), data.getMethodCounter());

 		assertEquals(CounterImpl.getInstance(0, 0), data.getClassCounter());

 	}

 

 	@Test

-	public void testMissed() {

+	public void testInstructionMissed() {

 		MethodCoverage data = new MethodCoverage("sample", "()V", null);

 		data.addInsn(false, 0);

 		data.addInsn(false, 0);

@@ -57,12 +58,13 @@ public class MethodCoverageTest {
 		assertEquals(CounterImpl.getInstance(1, 0), data.getLineCounter());

 		assertEquals(CounterImpl.getInstance(2, 0),

 				data.getInstructionCounter());

+		assertEquals(CounterImpl.getInstance(0, 0), data.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(1, 0), data.getMethodCounter());

 		assertEquals(CounterImpl.getInstance(0, 0), data.getClassCounter());

 	}

 

 	@Test

-	public void testCovered() {

+	public void testInstructionCovered() {

 		MethodCoverage data = new MethodCoverage("sample", "()V", null);

 		data.addInsn(true, 0);

 		data.addInsn(false, 0);

@@ -70,18 +72,33 @@ public class MethodCoverageTest {
 		assertEquals(CounterImpl.getInstance(1, 1), data.getLineCounter());

 		assertEquals(CounterImpl.getInstance(2, 1),

 				data.getInstructionCounter());

+		assertEquals(CounterImpl.getInstance(0, 0), data.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(1, 1), data.getMethodCounter());

 		assertEquals(CounterImpl.getInstance(0, 0), data.getClassCounter());

 	}

 

 	@Test

-	public void testNoLine() {

+	public void testInstructionNoLine() {

 		MethodCoverage data = new MethodCoverage("sample", "()V", null);

 		data.addInsn(false, IMethodStructureVisitor.UNKNOWN_LINE);

 

 		assertEquals(CounterImpl.getInstance(0, 0), data.getLineCounter());

 		assertEquals(CounterImpl.getInstance(1, 0),

 				data.getInstructionCounter());

+		assertEquals(CounterImpl.getInstance(0, 0), data.getBranchCounter());

+		assertEquals(CounterImpl.getInstance(1, 0), data.getMethodCounter());

+		assertEquals(CounterImpl.getInstance(0, 0), data.getClassCounter());

+	}

+

+	@Test

+	public void testBranches() {

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

+		data.addBranches(7, 3, 0);

+

+		assertEquals(CounterImpl.getInstance(0, 0), data.getLineCounter());

+		assertEquals(CounterImpl.getInstance(0, 0),

+				data.getInstructionCounter());

+		assertEquals(CounterImpl.getInstance(7, 3), data.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(1, 0), data.getMethodCounter());

 		assertEquals(CounterImpl.getInstance(0, 0), data.getClassCounter());

 	}

diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java
index 5d03dc77..9b71fe14 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/NodeComparatorTest.java
@@ -37,7 +37,8 @@ public class NodeComparatorTest {
 		ICoverageNode d4 = new MockBlockData(60);

 		ICoverageNode d5 = new MockBlockData(99);

 		final List<ICoverageNode> result = CounterComparator.TOTALITEMS.on(

-				CounterEntity.BLOCK).sort(Arrays.asList(d3, d5, d1, d4, d2));

+				CounterEntity.INSTRUCTION).sort(

+				Arrays.asList(d3, d5, d1, d4, d2));

 		assertEquals(Arrays.asList(d1, d2, d3, d4, d5), result);

 	}

 

@@ -46,7 +47,7 @@ public class NodeComparatorTest {
 		ICoverageNode d1 = new MockBlockLineData(5, 30);

 		ICoverageNode d2 = new MockBlockLineData(3, 80);

 		final NodeComparator c1 = CounterComparator.TOTALITEMS

-				.on(CounterEntity.BLOCK);

+				.on(CounterEntity.INSTRUCTION);

 		final NodeComparator c2 = CounterComparator.TOTALITEMS

 				.on(CounterEntity.LINE);

 		assertTrue(c1.second(c2).compare(d1, d2) > 0);

@@ -57,7 +58,7 @@ public class NodeComparatorTest {
 		ICoverageNode d1 = new MockBlockLineData(5, 30);

 		ICoverageNode d2 = new MockBlockLineData(5, 80);

 		final NodeComparator c1 = CounterComparator.TOTALITEMS

-				.on(CounterEntity.BLOCK);

+				.on(CounterEntity.INSTRUCTION);

 		final NodeComparator c2 = CounterComparator.TOTALITEMS

 				.on(CounterEntity.LINE);

 		assertTrue(c1.second(c2).compare(d1, d2) < 0);

@@ -66,14 +67,15 @@ public class NodeComparatorTest {
 	private static final class MockBlockData extends CoverageNodeImpl {

 		MockBlockData(int total) {

 			super(GROUP, "mock", false);

-			blockCounter = CounterImpl.getInstance(total, false);

+			instructionCounter = CounterImpl.getInstance(total, false);

 		}

 	}

 

 	private static final class MockBlockLineData extends CoverageNodeImpl {

-		MockBlockLineData(int totalBlock, int totalLine) {

+		MockBlockLineData(int totalInstruction, int totalLine) {

 			super(GROUP, "mock", false);

-			blockCounter = CounterImpl.getInstance(totalBlock, false);

+			instructionCounter = CounterImpl.getInstance(totalInstruction,

+					false);

 			lineCounter = CounterImpl.getInstance(totalLine, false);

 		}

 	}

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
index d20a2282..5d625899 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/analysis/PackageCoverageTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/PackageCoverageTest.java
@@ -56,7 +56,7 @@ public class PackageCoverageTest {
 			{

 				classCounter = CounterImpl.getInstance(9, 0);

 				methodCounter = CounterImpl.getInstance(9, 0);

-				blockCounter = CounterImpl.getInstance(9, 0);

+				branchCounter = CounterImpl.getInstance(9, 0);

 				instructionCounter = CounterImpl.getInstance(9, 0);

 				lines.increment(1, false);

 			}

@@ -67,7 +67,7 @@ public class PackageCoverageTest {
 			{

 				classCounter = CounterImpl.getInstance(1, 0);

 				methodCounter = CounterImpl.getInstance(2, 0);

-				blockCounter = CounterImpl.getInstance(3, 0);

+				branchCounter = CounterImpl.getInstance(3, 0);

 				instructionCounter = CounterImpl.getInstance(4, 0);

 				lines.increment(1, false);

 				lines.increment(2, false);

@@ -81,7 +81,7 @@ public class PackageCoverageTest {
 				Collections.singleton(sourceFile));

 		assertEquals(CounterImpl.getInstance(1, 0), data.getClassCounter());

 		assertEquals(CounterImpl.getInstance(2, 0), data.getMethodCounter());

-		assertEquals(CounterImpl.getInstance(3, 0), data.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(3, 0), data.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(4, 0),

 				data.getInstructionCounter());

 		assertEquals(CounterImpl.getInstance(5, 0), data.getLineCounter());

@@ -97,7 +97,7 @@ public class PackageCoverageTest {
 			{

 				classCounter = CounterImpl.getInstance(1, 0);

 				methodCounter = CounterImpl.getInstance(2, 0);

-				blockCounter = CounterImpl.getInstance(3, 0);

+				branchCounter = CounterImpl.getInstance(3, 0);

 				instructionCounter = CounterImpl.getInstance(4, 0);

 			}

 		};

@@ -107,7 +107,7 @@ public class PackageCoverageTest {
 				Collections.singleton(classnode), sourceFiles);

 		assertEquals(CounterImpl.getInstance(1, 0), data.getClassCounter());

 		assertEquals(CounterImpl.getInstance(2, 0), data.getMethodCounter());

-		assertEquals(CounterImpl.getInstance(3, 0), data.getBlockCounter());

+		assertEquals(CounterImpl.getInstance(3, 0), data.getBranchCounter());

 		assertEquals(CounterImpl.getInstance(4, 0),

 				data.getInstructionCounter());

 		assertEquals(CounterImpl.getInstance(0, 0), data.getLineCounter());

diff --git a/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java
index 13ebbaca..ec12f9da 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/runtime/AgentOptionsTest.java
@@ -43,8 +43,8 @@ public class AgentOptionsTest {
 		assertTrue(options.getAppend());

 		assertEquals("*", options.getIncludes());

 		assertEquals("", options.getExcludes());

-		assertEquals("sun.reflect.DelegatingClassLoader", options

-				.getExclClassloader());

+		assertEquals("sun.reflect.DelegatingClassLoader",

+				options.getExclClassloader());

 		assertNull(options.getSessionId());

 		assertTrue(options.getDumpOnExit());

 		assertEquals(6300, options.getPort());

@@ -60,6 +60,12 @@ public class AgentOptionsTest {
 	}

 

 	@Test

+	public void testNullOptions() {

+		AgentOptions options = new AgentOptions(null);

+		assertEquals("", options.toString());

+	}

+

+	@Test

 	public void testGetDestile() {

 		AgentOptions options = new AgentOptions("destfile=/var/test.exec");

 		assertEquals("/var/test.exec", options.getDestfile());

@@ -113,8 +119,8 @@ public class AgentOptionsTest {
 		AgentOptions options = new AgentOptions();

 		options.setExclClassloader("org.jacoco.test.TestLoader");

 		assertEquals("org.jacoco.test.TestLoader", options.getExclClassloader());

-		assertEquals("exclclassloader=org.jacoco.test.TestLoader", options

-				.toString());

+		assertEquals("exclclassloader=org.jacoco.test.TestLoader",

+				options.toString());

 	}

 

 	@Test

@@ -274,8 +280,9 @@ public class AgentOptionsTest {
 		AgentOptions options = new AgentOptions();

 		String vmArgument = options.getVMArgument(defaultAgentJarFile);

 

-		assertEquals(String.format("-javaagent:%s=", defaultAgentJarFile

-				.toString()), vmArgument);

+		assertEquals(

+				String.format("-javaagent:%s=", defaultAgentJarFile.toString()),

+				vmArgument);

 	}

 

 	@Test

@@ -285,8 +292,9 @@ public class AgentOptionsTest {
 

 		String vmArgument = options.getVMArgument(defaultAgentJarFile);

 

-		assertEquals(String.format("-javaagent:%s=append=true",

-				defaultAgentJarFile.toString()), vmArgument);

+		assertEquals(

+				String.format("-javaagent:%s=append=true",

+						defaultAgentJarFile.toString()), vmArgument);

 	}

 

 	@Test