Polish ExtensionRegistry

junit-team · Jun 1, 2016 · 1f8a20c · 1f8a20c
1 parent 502a023
commit 1f8a20c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ExtensionRegistry.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ExtensionRegistry.java
@@ -43,8 +43,11 @@ public class ExtensionRegistry {
 
 	private static final Logger LOG = Logger.getLogger(ExtensionRegistry.class.getName());
 
-	private static final List<Class<? extends Extension>> DEFAULT_EXTENSIONS = Collections.unmodifiableList(
-		Arrays.asList(DisabledCondition.class, TestInfoParameterResolver.class, TestReporterParameterResolver.class));
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static final List<RegisteredExtension> DEFAULT_EXTENSIONS = Collections.unmodifiableList(
+		Arrays.asList(new RegisteredExtension(new DisabledCondition(), ExtensionRegistry.class),
+			new RegisteredExtension(new TestInfoParameterResolver(), ExtensionRegistry.class),
+			new RegisteredExtension(new TestReporterParameterResolver(), ExtensionRegistry.class)));
 
 	/**
 	 * Factory for creating a new empty root registry.
@@ -63,7 +66,7 @@ public static ExtensionRegistry createEmptyRegistry() {
 	 */
 	public static ExtensionRegistry createRegistryWithDefaultExtensions() {
 		ExtensionRegistry extensionRegistry = new ExtensionRegistry(Optional.empty());
-		DEFAULT_EXTENSIONS.forEach(extensionRegistry::registerExtension);
+		DEFAULT_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
 		return extensionRegistry;
 	}
 
@@ -182,6 +185,12 @@ void registerExtension(Class<? extends Extension> extensionType) {
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
+	private void registerDefaultExtension(RegisteredExtension registeredExtension) {
+		this.registeredExtensions.add(registeredExtension);
+		this.registeredExtensionTypes.add(registeredExtension.getExtension().getClass());
+	}
+
 	private void registerExtension(Extension extension) {
 		registerExtension(extension, extension);
 	}