Simplify DefaultLauncher, remove TestEngineRegistry interface

junit-team · Jan 22, 2016 · 9c963d4 · 9c963d4
1 parent 1f209b6
commit 9c963d4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 58 deletions.
diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/main/DefaultLauncher.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/main/DefaultLauncher.java
@@ -38,28 +38,16 @@ class DefaultLauncher implements Launcher {
 
 	private static final Logger LOG = Logger.getLogger(DefaultLauncher.class.getName());
 
-	private final TestEngineRegistry testEngineRegistry;
+	private final TestExecutionListenerRegistry listenerRegistry = new TestExecutionListenerRegistry();
-	private final TestExecutionListenerRegistry testExecutionListenerRegistry;
+	private final Iterable<TestEngine> testEngines;
 
-	DefaultLauncher() {
+	DefaultLauncher(Iterable<TestEngine> testEngines) {
-		this(new ServiceLoaderTestEngineRegistry(), new TestExecutionListenerRegistry());
+		this.testEngines = testEngines;
-	}
-
-	// For tests only
-	DefaultLauncher(TestEngineRegistry testEngineRegistry) {
-		this(testEngineRegistry, new TestExecutionListenerRegistry());
-	}
-
-	// For tests only
-	DefaultLauncher(TestEngineRegistry testEngineRegistry,
-			TestExecutionListenerRegistry testExecutionListenerRegistry) {
-		this.testEngineRegistry = testEngineRegistry;
-		this.testExecutionListenerRegistry = testExecutionListenerRegistry;
 	}
 
 	@Override
 	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
-		testExecutionListenerRegistry.registerListener(listeners);
+		listenerRegistry.registerListener(listeners);
 	}
 
 	@Override
@@ -77,7 +65,7 @@ private Root discoverRoot(TestDiscoveryRequest discoveryRequest, String phase) {
 
 		Set<String> uniqueEngineIds = new HashSet<>();
 
-		for (TestEngine testEngine : testEngineRegistry.getTestEngines()) {
+		for (TestEngine testEngine : testEngines) {
 			final String engineId = testEngine.getId();
 
 			if (discoveryRequest.getEngineIdFilters().stream().map(
@@ -88,9 +76,8 @@ private Root discoverRoot(TestDiscoveryRequest discoveryRequest, String phase) {
 			}
 
 			if (!uniqueEngineIds.add(engineId)) {
-				throw new JUnitException(String.format(
+				throw new JUnitException(
-					"Failure in launcher: TestEngineRegistry [%s] returned multiple engines with the same ID [%s].",
+					String.format("Failure in launcher: multiple engines with the same ID [%s].", engineId));
-					testEngineRegistry.getClass().getName(), engineId));
 			}
 
 			LOG.fine(
@@ -105,7 +92,7 @@ private Root discoverRoot(TestDiscoveryRequest discoveryRequest, String phase) {
 
 	private void execute(Root root) {
 		TestPlan testPlan = TestPlan.from(root.getEngineDescriptors());
-		TestExecutionListener testExecutionListener = testExecutionListenerRegistry.getCompositeTestExecutionListener();
+		TestExecutionListener testExecutionListener = listenerRegistry.getCompositeTestExecutionListener();
 		testExecutionListener.testPlanExecutionStarted(testPlan);
 		ExecutionListenerAdapter engineExecutionListener = new ExecutionListenerAdapter(testPlan,
 			testExecutionListener);

diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/main/LauncherFactory.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/main/LauncherFactory.java
@@ -10,7 +10,7 @@
 
 package org.junit.gen5.launcher.main;
 
-import org.junit.gen5.launcher.*;
+import org.junit.gen5.launcher.Launcher;
 
 /**
  * Factory for creating {@link Launcher} instances by invoking {@link #create()}.
@@ -28,10 +28,11 @@
 public class LauncherFactory {
 
 	/**
-	 * Factory method for creating a new instance of {@link Launcher}.
+	 * Factory method for creating a new instance of {@link Launcher} using dynamically
+	 * registered test engines.
 	 */
 	public static Launcher create() {
-		return new DefaultLauncher();
+		return new DefaultLauncher(new ServiceLoaderTestEngineRegistry().loadTestEngines());
 	}
 
 }
diff --git a/...-launcher/src/main/java/org/junit/gen5/launcher/main/ServiceLoaderTestEngineRegistry.java b/...-launcher/src/main/java/org/junit/gen5/launcher/main/ServiceLoaderTestEngineRegistry.java
@@ -22,19 +22,15 @@
 /**
  * @since 5.0
  */
-class ServiceLoaderTestEngineRegistry implements TestEngineRegistry {
+class ServiceLoaderTestEngineRegistry {
 
 	private static final Logger LOG = Logger.getLogger(ServiceLoaderTestEngineRegistry.class.getName());
 
-	private static Iterable<TestEngine> testEngines;
+	public Iterable<TestEngine> loadTestEngines() {
-
+		Iterable<TestEngine> testEngines = ServiceLoader.load(TestEngine.class,
-	@Override
+			ReflectionUtils.getDefaultClassLoader());
-	public synchronized Iterable<TestEngine> getTestEngines() {
+		LOG.info(() -> "Discovered TestEngines with IDs "
-		if (testEngines == null) {
+				+ stream(testEngines.spliterator(), false).map(TestEngine::getId).collect(toList()));
-			testEngines = ServiceLoader.load(TestEngine.class, ReflectionUtils.getDefaultClassLoader());
-			LOG.info(() -> "Discovered TestEngines with IDs "
-					+ stream(testEngines.spliterator(), false).map(TestEngine::getId).collect(toList()));
-		}
 		return testEngines;
 	}
 

diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/main/TestEngineRegistry.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/main/TestEngineRegistry.java
diff --git a/...sts/src/test/java/org/junit/gen5/launcher/main/LauncherFactoryForTestingPurposesOnly.java b/...sts/src/test/java/org/junit/gen5/launcher/main/LauncherFactoryForTestingPurposesOnly.java
@@ -24,7 +24,7 @@ public static DefaultLauncher createLauncher(TestEngine... engines) {
 	}
 
 	public static DefaultLauncher createLauncher(Iterable<TestEngine> engines) {
-		return new DefaultLauncher(() -> engines);
+		return new DefaultLauncher(engines);
 	}
 
 }