Improve ValidationTestBase (#440)

- Allow multiple classes to be instrumented from a package
- Common validation test base for "bad cycles test"
- Use "main(String[])" method as common execution interface
- Use identifiers for all line tags

20 files changed, 68 insertions, 215 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleClassTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleClassTest.java
index 47820e68..cbf3c35b 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleClassTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleClassTest.java
@@ -18,7 +18,7 @@ import org.junit.Test;
 /**
  * Test of "bad cycles" with classes.
  */
-public class BadCycleClassTest extends BadCycleTestBase {
+public class BadCycleClassTest extends ValidationTestBase {
 
 	public BadCycleClassTest() throws Exception {
 		super(BadCycleClass.class);
@@ -26,12 +26,9 @@ public class BadCycleClassTest extends BadCycleTestBase {
 
 	@Test
 	public void test() throws Exception {
-		loader.loadClass(BadCycleClass.Child.class.getName()).newInstance();
-
-		analyze(BadCycleClass.Child.class);
-		assertLine("1", ICounter.FULLY_COVERED);
-		assertLine("2", ICounter.FULLY_COVERED);
-		assertLine("3", ICounter.FULLY_COVERED);
+		assertLine("childinit", ICounter.FULLY_COVERED);
+		assertLine("childsomeMethod", ICounter.FULLY_COVERED);
+		assertLine("childclinit", ICounter.FULLY_COVERED);
 	}
 
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleTestBase.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleTestBase.java
deleted file mode 100644
index dd7b4992..00000000
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BadCycleTestBase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
- * 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:
- *    Evgeny Mandrikov - initial API and implementation
- *
- *******************************************************************************/
-package org.jacoco.core.test.validation;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.jacoco.core.analysis.Analyzer;
-import org.jacoco.core.analysis.CoverageBuilder;
-import org.jacoco.core.analysis.IClassCoverage;
-import org.jacoco.core.analysis.ISourceFileCoverage;
-import org.jacoco.core.data.ExecutionDataStore;
-import org.jacoco.core.test.InstrumentingLoader;
-
-class BadCycleTestBase extends ValidationTestBase {
-
-	protected final InstrumentingLoader loader = new InstrumentingLoader();
-
-	BadCycleTestBase(final Class<?> target) throws Exception {
-		super(target);
-	}
-
-	BadCycleTestBase(final String srcFolder, final Class<?> target)
-			throws Exception {
-		super(srcFolder, target);
-	}
-
-	@Override
-	public final void setup() throws Exception {
-		// nop
-	}
-
-	@Override
-	protected final void run(Class<?> targetClass) throws Exception {
-		// nop
-	}
-
-	final void analyze(Class<?> cls) throws IOException {
-		final byte[] bytes = loader.getClassBytes(cls.getName());
-		final ExecutionDataStore store = loader.collect();
-
-		final CoverageBuilder builder = new CoverageBuilder();
-		final Analyzer analyzer = new Analyzer(store, builder);
-		analyzer.analyzeClass(bytes, "TestTarget");
-		final Collection<IClassCoverage> classes = builder.getClasses();
-		assertEquals(1, classes.size(), 0.0);
-		classCoverage = classes.iterator().next();
-		final Collection<ISourceFileCoverage> files = builder.getSourceFiles();
-		assertEquals(1, files.size(), 0.0);
-		sourceCoverage = files.iterator().next();
-
-		source = Source.getSourceFor(srcFolder, target);
-	}
-
-}
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BooleanExpressionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/BooleanExpressionsTest.java
index cb193ec3..fa21da85 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/BooleanExpressionsTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/BooleanExpressionsTest.java
@@ -24,12 +24,6 @@ public class BooleanExpressionsTest extends ValidationTestBase {
 		super(Target02.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		final Object instance = targetClass.newInstance();
-		((Runnable) instance).run();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassInitializerTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassInitializerTest.java
index ba9a7ef4..cdbe4e07 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassInitializerTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassInitializerTest.java
@@ -24,12 +24,6 @@ public class ClassInitializerTest extends ValidationTestBase {
 		super(Target05.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		// Force class initialization
-		targetClass.getField("CONST1").get(null);
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java
index cc5e9dd7..284ed9dd 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java
@@ -24,12 +24,6 @@ public class ControlStructuresTest extends ValidationTestBase {
 		super(Target01.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		final Object instance = targetClass.newInstance();
-		((Runnable) instance).run();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExceptionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExceptionsTest.java
index 17c74cab..596ba56e 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExceptionsTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExceptionsTest.java
@@ -24,12 +24,6 @@ public class ExceptionsTest extends ValidationTestBase {
 		super(Target03.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		final Object instance = targetClass.newInstance();
-		((Runnable) instance).run();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExplicitInitialFrameTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExplicitInitialFrameTest.java
index bb7b43ad..2da79536 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExplicitInitialFrameTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ExplicitInitialFrameTest.java
@@ -24,12 +24,6 @@ public class ExplicitInitialFrameTest extends ValidationTestBase {
 		super(Target11.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		final Object instance = targetClass.newInstance();
-		((Runnable) instance).run();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/FieldInitializationInTwoConstructorsTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/FieldInitializationInTwoConstructorsTest.java
index d9c2333c..afd0440f 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/FieldInitializationInTwoConstructorsTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/FieldInitializationInTwoConstructorsTest.java
@@ -25,11 +25,6 @@ public class FieldInitializationInTwoConstructorsTest extends
 		super(Target09.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		targetClass.newInstance();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitDefaultConstructorTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitDefaultConstructorTest.java
index 4b04db1f..8f80a947 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitDefaultConstructorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitDefaultConstructorTest.java
@@ -24,11 +24,6 @@ public class ImplicitDefaultConstructorTest extends ValidationTestBase {
 		super(Target06.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		targetClass.newInstance();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitFieldInitializationTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitFieldInitializationTest.java
index d8a2188f..922266bd 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitFieldInitializationTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ImplicitFieldInitializationTest.java
@@ -24,11 +24,6 @@ public class ImplicitFieldInitializationTest extends ValidationTestBase {
 		super(Target08.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		targetClass.newInstance();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/PrivateEmptyDefaultConstructorTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/PrivateEmptyDefaultConstructorTest.java
index fe9a6c7e..e38bc32a 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/PrivateEmptyDefaultConstructorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/PrivateEmptyDefaultConstructorTest.java
@@ -24,12 +24,6 @@ public class PrivateEmptyDefaultConstructorTest extends ValidationTestBase {
 		super(Target07.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		// Force class initialization
-		targetClass.getField("CONST").get(null);
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ProbesBeforeSuperConstructorTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ProbesBeforeSuperConstructorTest.java
index 4714b6b8..c99a99b3 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ProbesBeforeSuperConstructorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ProbesBeforeSuperConstructorTest.java
@@ -24,11 +24,6 @@ public class ProbesBeforeSuperConstructorTest extends ValidationTestBase {
 		super(Target10.class);
 	}
 
-	@Override
-	protected void run(final Class<?> targetClass) throws Exception {
-		targetClass.newInstance();
-	}
-
 	@Test
 	public void testCoverageResult() {
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java
index 5216a057..67c4634d 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java
@@ -12,23 +12,19 @@
 package org.jacoco.core.test.validation;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
-import java.util.Collection;
 
 import org.jacoco.core.analysis.Analyzer;
 import org.jacoco.core.analysis.CoverageBuilder;
-import org.jacoco.core.analysis.IClassCoverage;
 import org.jacoco.core.analysis.ICounter;
 import org.jacoco.core.analysis.ILine;
 import org.jacoco.core.analysis.ISourceFileCoverage;
+import org.jacoco.core.data.ExecutionData;
 import org.jacoco.core.data.ExecutionDataStore;
-import org.jacoco.core.data.SessionInfoStore;
-import org.jacoco.core.instr.Instrumenter;
 import org.jacoco.core.internal.analysis.CounterImpl;
-import org.jacoco.core.runtime.IRuntime;
-import org.jacoco.core.runtime.RuntimeData;
-import org.jacoco.core.runtime.SystemPropertiesRuntime;
+import org.jacoco.core.test.InstrumentingLoader;
 import org.jacoco.core.test.TargetLoader;
 import org.junit.Before;
 
@@ -51,14 +47,10 @@ public abstract class ValidationTestBase {
 
 	protected final Class<?> target;
 
-	protected IClassCoverage classCoverage;
-
 	protected ISourceFileCoverage sourceCoverage;
 
 	protected Source source;
 
-	protected TargetLoader loader;
-
 	protected ValidationTestBase(final String srcFolder, final Class<?> target) {
 		this.srcFolder = srcFolder;
 		this.target = target;
@@ -70,40 +62,44 @@ public abstract class ValidationTestBase {
 
 	@Before
 	public void setup() throws Exception {
-		loader = new TargetLoader();
-		final byte[] bytes = TargetLoader.getClassDataAsBytes(target);
-		final ExecutionDataStore store = execute(bytes);
-		analyze(bytes, store);
+		final ExecutionDataStore store = execute();
+		analyze(store);
 		source = Source.getSourceFor(srcFolder, target);
 	}
 
-	private ExecutionDataStore execute(final byte[] bytes) throws Exception {
-		RuntimeData data = new RuntimeData();
-		IRuntime runtime = new SystemPropertiesRuntime();
-		runtime.startup(data);
-
-		final byte[] instrumented = new Instrumenter(runtime).instrument(bytes,
-				"TestTarget");
-		run(loader.add(target, instrumented));
-		final ExecutionDataStore store = new ExecutionDataStore();
-		data.collect(store, new SessionInfoStore(), false);
-		runtime.shutdown();
-		return store;
+	private ExecutionDataStore execute() throws Exception {
+		InstrumentingLoader loader = new InstrumentingLoader(target);
+		run(loader.loadClass(target.getName()));
+		return loader.collect();
 	}
 
-	protected abstract void run(final Class<?> targetClass) throws Exception;
+	protected void run(final Class<?> targetClass) throws Exception {
+		targetClass.getMethod("main", String[].class).invoke(null,
+				(Object) new String[0]);
+	}
 
-	private void analyze(final byte[] bytes, final ExecutionDataStore store)
-			throws IOException {
+	private void analyze(final ExecutionDataStore store) throws IOException {
 		final CoverageBuilder builder = new CoverageBuilder();
 		final Analyzer analyzer = new Analyzer(store, builder);
-		analyzer.analyzeClass(bytes, "TestTarget");
-		final Collection<IClassCoverage> classes = builder.getClasses();
-		assertEquals(1, classes.size(), 0.0);
-		classCoverage = classes.iterator().next();
-		final Collection<ISourceFileCoverage> files = builder.getSourceFiles();
-		assertEquals(1, files.size(), 0.0);
-		sourceCoverage = files.iterator().next();
+		for (ExecutionData data : store.getContents()) {
+			analyze(analyzer, data);
+		}
+
+		String srcName = target.getName().replace('.', '/') + ".java";
+		for (ISourceFileCoverage file : builder.getSourceFiles()) {
+			if (srcName.equals(file.getPackageName() + "/" + file.getName())) {
+				sourceCoverage = file;
+				return;
+			}
+		}
+		fail("No source node found for " + srcName);
+	}
+
+	private void analyze(final Analyzer analyzer, final ExecutionData data)
+			throws IOException {
+		final byte[] bytes = TargetLoader.getClassDataAsBytes(
+				target.getClassLoader(), data.getName());
+		analyzer.analyzeClass(bytes, data.getName());
 	}
 
 	protected void assertLine(final String tag, final int status) {
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/BadCycleClass.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/BadCycleClass.java
index 44e40cd1..c524a211 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/BadCycleClass.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/BadCycleClass.java
@@ -24,15 +24,15 @@ public class BadCycleClass {
 	public static class Child extends Base {
 
 		static {
-			Stubs.nop("child clinit"); // $line-3$
+			Stubs.nop("child clinit"); // $line-childclinit$
 		}
 
 		public Child() {
-			Stubs.nop("child init"); // $line-1$
+			Stubs.nop("child init"); // $line-childinit$
 		}
 
 		void someMethod() {
-			Stubs.nop("child someMethod"); // $line-2$
+			Stubs.nop("child someMethod"); // $line-childsomeMethod$
 		}
 
 	}
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java
index ca5cd3b2..d5723ce3 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target01.java
@@ -21,9 +21,9 @@ import java.util.Collections;
 /**
  * This target exercises a set of common Java control structures.
  */
-public class Target01 implements Runnable {
+public class Target01 {
 
-	public void run() {
+	public static void main(String[] args) {
 
 		// 1. Unconditional execution
 		nop(); // $line-unconditional$
@@ -194,7 +194,7 @@ public class Target01 implements Runnable {
 
 	}
 
-	private void runReturn() {
+	private static void runReturn() {
 
 		// 20. Return statement
 		if (t()) {
@@ -204,13 +204,9 @@ public class Target01 implements Runnable {
 
 	}
 
-	private void runImplicitReturn() {
+	private static void runImplicitReturn() {
 
 		// 21. Implicit return
 	} // $line-implicitreturn$
 
-	public static void main(String[] args) {
-		new Target01().run();
-	}
-
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target02.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target02.java
index ef012ff6..08f0ba0b 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target02.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target02.java
@@ -20,9 +20,9 @@ import static org.jacoco.core.test.validation.targets.Stubs.t;
 /**
  * This target exercises boolean expressions.
  */
-public class Target02 implements Runnable {
+public class Target02 {
 
-	public void run() {
+	public static void main(String[] args) {
 
 		// 1. Boolean comparison result (one case)
 		nop(i2() > 3); // $line-booleancmp1$
@@ -117,8 +117,4 @@ public class Target02 implements Runnable {
 
 	}
 
-	public static void main(String[] args) {
-		new Target02().run();
-	}
-
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target03.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target03.java
index 26b3b13b..efa1354c 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target03.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target03.java
@@ -20,9 +20,10 @@ import org.jacoco.core.test.validation.targets.Stubs.StubException;
 /**
  * This target produces exception based control flow examples.
  */
-public class Target03 implements Runnable {
+public class Target03 {
+
+	public static void main(String[] args) {
 
-	public void run() {
 		try {
 			implicitException();
 		} catch (StubException e) {
@@ -46,18 +47,18 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void implicitException() {
+	private static void implicitException() {
 		nop(); // $line-implicitException.before$
 		ex(); // $line-implicitException.exception$
 		nop(); // $line-implicitException.after$
 	}
 
-	private void explicitException() {
+	private static void explicitException() {
 		nop(); // $line-explicitException.before$
 		throw new StubException(); // $line-explicitException.throw$
 	}
 
-	private void noExceptionTryCatch() {
+	private static void noExceptionTryCatch() {
 		nop(); // $line-noExceptionTryCatch.beforeBlock$
 		try {
 			nop(); // $line-noExceptionTryCatch.tryBlock$
@@ -66,7 +67,7 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void implicitExceptionTryCatch() {
+	private static void implicitExceptionTryCatch() {
 		nop(); // $line-implicitExceptionTryCatch.beforeBlock$
 		try {
 			nop(); // $line-implicitExceptionTryCatch.before$
@@ -77,7 +78,7 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void implicitExceptionTryCatchAfterCondition() {
+	private static void implicitExceptionTryCatchAfterCondition() {
 		if (f()) { // $line-implicitExceptionTryCatchAfterCondition.condition$
 			return;
 		}
@@ -88,7 +89,7 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void explicitExceptionTryCatch() {
+	private static void explicitExceptionTryCatch() {
 		nop(); // $line-explicitExceptionTryCatch.beforeBlock$
 		try {
 			nop(); // $line-explicitExceptionTryCatch.before$
@@ -98,7 +99,7 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void noExceptionFinally() {
+	private static void noExceptionFinally() {
 		nop(); // $line-noExceptionFinally.beforeBlock$
 		try {
 			nop(); // $line-noExceptionFinally.tryBlock$
@@ -107,7 +108,7 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void implicitExceptionFinally() {
+	private static void implicitExceptionFinally() {
 		nop(); // $line-implicitExceptionFinally.beforeBlock$
 		try {
 			nop(); // $line-implicitExceptionFinally.before$
@@ -118,7 +119,7 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	private void explicitExceptionFinally() {
+	private static void explicitExceptionFinally() {
 		nop(); // $line-explicitExceptionFinally.beforeBlock$
 		try {
 			nop(); // $line-explicitExceptionFinally.before$
@@ -128,8 +129,4 @@ public class Target03 implements Runnable {
 		}
 	}
 
-	public static void main(String[] args) {
-		new Target03().run();
-	}
-
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target07.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target07.java
index 15afb506..93dcaa3e 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target07.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target07.java
@@ -19,8 +19,6 @@ public class Target07 { // $line-classdef$
 	private Target07() {
 	} // $line-constructor$
 
-	public static final int CONST = 42;
-
 	public static void main(String[] args) {
 	}
 
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target11.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target11.java
index a6a59c42..5f597cb0 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target11.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target11.java
@@ -18,16 +18,14 @@ import static org.jacoco.core.test.validation.targets.Stubs.nop;
  * This test target needs an explicit initial frame as the first instruction
  * already is a jump target.
  */
-public class Target11 implements Runnable {
+public class Target11 {
+
+	public static void main(String[] args) {
 
-	public void run() {
 		do {
 			nop(); // $line-dowhilebody$
 		} while (f());
-	}
 
-	public static void main(String[] args) {
-		new Target11().run();
 	}
 
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target12.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target12.java
index f5ea03e0..0c445cd6 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target12.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/targets/Target12.java
@@ -16,20 +16,16 @@ import static org.jacoco.core.test.validation.targets.Stubs.nop;
 /**
  * This target uses synchronized blocks which compile to try/catch statements.
  */
-public class Target12 implements Runnable {
+public class Target12 {
 
-	public void run() {
-		simple();
-		nested();
-	}
-
-	void simple() {
-		synchronized (this) {
+	static void simple() {
+		Object lock1 = new Object();
+		synchronized (lock1) {
 			nop();
 		}
 	}
 
-	void nested() {
+	static void nested() {
 		Object lock1 = new Object();
 		synchronized (lock1) {
 			nop();
@@ -43,7 +39,8 @@ public class Target12 implements Runnable {
 	}
 
 	public static void main(String[] args) {
-		new Target12().run();
+		simple();
+		nested();
 	}
 
 }