Allow loading multiple test target classes in preparation for Java 8

integration tests.

2 files changed, 6 insertions, 4 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/CyclomaticComplexityTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/CyclomaticComplexityTest.java
index a431f384..96ef9f28 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/CyclomaticComplexityTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/CyclomaticComplexityTest.java
@@ -255,8 +255,8 @@ public class CyclomaticComplexityTest {
 			throws Exception {
 		reader = new ClassReader(TargetLoader.getClassData(clazz));
 		final byte[] bytes = new Instrumenter(runtime).instrument(reader);
-		final TargetLoader loader = new TargetLoader(clazz, bytes);
-		target = (Target) loader.getTargetClass().newInstance();
+		final TargetLoader loader = new TargetLoader();
+		target = (Target) loader.add(clazz, bytes).newInstance();
 	}
 
 	private ICounter analyze() {
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 626db9ff..6e24505d 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
@@ -55,12 +55,15 @@ public abstract class ValidationTestBase {
 
 	protected Source source;
 
+	protected TargetLoader loader;
+
 	protected ValidationTestBase(final Class<?> target) {
 		this.target = target;
 	}
 
 	@Before
 	public void setup() throws Exception {
+		loader = new TargetLoader();
 		final ClassReader reader = new ClassReader(
 				TargetLoader.getClassData(target));
 		final ExecutionDataStore store = execute(reader);
@@ -74,8 +77,7 @@ public abstract class ValidationTestBase {
 		IRuntime runtime = new SystemPropertiesRuntime();
 		runtime.startup(data);
 		final byte[] bytes = new Instrumenter(runtime).instrument(reader);
-		final TargetLoader loader = new TargetLoader(target, bytes);
-		run(loader.getTargetClass());
+		run(loader.add(target, bytes));
 		final ExecutionDataStore store = new ExecutionDataStore();
 		data.collect(store, new SessionInfoStore(), false);
 		runtime.shutdown();