Reuse CollectionUtils.forEachInReverseOrder

Author: marcphilipp

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java

@@ -22,6 +22,7 @@
 import static org.junit.jupiter.engine.descriptor.LifecycleMethodUtils.findBeforeEachMethods;
 import static org.junit.jupiter.engine.descriptor.TestInstanceLifecycleUtils.getTestInstanceLifecycle;
 import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector;
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -457,15 +458,15 @@ private void invokeAfterAllCallbacks(JupiterEngineExecutionContext context) {
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
-		registry.getReversedExtensions(AfterAllCallback.class)//
-				.forEach(extension -> throwableCollector.execute(() -> extension.afterAll(extensionContext)));
+		forEachInReverseOrder(registry.getExtensions(AfterAllCallback.class), //
+			extension -> throwableCollector.execute(() -> extension.afterAll(extensionContext)));
 	}
 
 	private void invokeTestInstancePreDestroyCallbacks(JupiterEngineExecutionContext context) {
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
-		context.getExtensionRegistry().getReversedExtensions(TestInstancePreDestroyCallback.class).forEach(
+		forEachInReverseOrder(context.getExtensionRegistry().getExtensions(TestInstancePreDestroyCallback.class), //
 			extension -> throwableCollector.execute(() -> extension.preDestroyTestInstance(extensionContext)));
 	}
 

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java

@@ -107,7 +107,9 @@ static Set<TestTag> getTags(AnnotatedElement element) {
 	<E extends Extension> void invokeExecutionExceptionHandlers(Class<E> handlerType, ExtensionRegistry registry,
 			Throwable throwable, ExceptionHandlerInvoker<E> handlerInvoker) {
 
-		invokeExecutionExceptionHandlers(registry.getReversedExtensions(handlerType), throwable, handlerInvoker);
+		List<E> extensions = registry.getExtensions(handlerType);
+		Collections.reverse(extensions);
+		invokeExecutionExceptionHandlers(extensions, throwable, handlerInvoker);
 	}
 
 	private <E extends Extension> void invokeExecutionExceptionHandlers(List<E> exceptionHandlers, Throwable throwable,

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java

@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.engine.descriptor.DisplayNameUtils.determineDisplayNameForMethod;
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
 
 import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
@@ -25,7 +26,6 @@
 import org.junit.jupiter.api.extension.TestWatcher;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
-import org.junit.jupiter.engine.extension.ExtensionRegistry;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ClassUtils;
@@ -123,13 +123,9 @@ public void nodeSkipped(JupiterEngineExecutionContext context, TestDescriptor de
 	protected void invokeTestWatchers(JupiterEngineExecutionContext context, boolean reverseOrder,
 			Consumer<TestWatcher> callback) {
 
-		ExtensionRegistry registry = context.getExtensionRegistry();
+		List<TestWatcher> watchers = context.getExtensionRegistry().getExtensions(TestWatcher.class);
 
-		List<TestWatcher> watchers = reverseOrder //
-				? registry.getReversedExtensions(TestWatcher.class)
-				: registry.getExtensions(TestWatcher.class);
-
-		watchers.forEach(watcher -> {
+		Consumer<TestWatcher> action = watcher -> {
 			try {
 				callback.accept(watcher);
 			}
@@ -143,7 +139,13 @@ protected void invokeTestWatchers(JupiterEngineExecutionContext context, boolean
 							extensionContext.getRequiredTestMethod()),
 						getDisplayName()));
 			}
-		});
+		};
+		if (reverseOrder) {
+			forEachInReverseOrder(watchers, action);
+		}
+		else {
+			watchers.forEach(action);
+		}
 	}
 
 }

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java

@@ -14,6 +14,7 @@
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.populateNewExtensionRegistryFromExtendWithAnnotation;
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.registerExtensionsFromExecutableParameters;
 import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector;
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
 
 import java.lang.reflect.Method;
 
@@ -272,7 +273,7 @@ private <T extends Extension> void invokeAllAfterMethodsOrCallbacks(Class<T> typ
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
-		registry.getReversedExtensions(type).forEach(callback -> {
+		forEachInReverseOrder(registry.getExtensions(type), callback -> {
 			throwableCollector.execute(() -> callbackInvoker.invoke(callback, extensionContext));
 		});
 	}

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java

@@ -14,7 +14,6 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -36,7 +35,6 @@ public interface ExtensionRegistry {
 	 * in this registry or one of its ancestors.
 	 *
 	 * @param extensionType the type of {@link Extension} to stream
-	 * @see #getReversedExtensions(Class)
 	 * @see #getExtensions(Class)
 	 */
 	<E extends Extension> Stream<E> stream(Class<E> extensionType);
@@ -46,25 +44,10 @@ public interface ExtensionRegistry {
 	 * in this registry or one of its ancestors.
 	 *
 	 * @param extensionType the type of {@link Extension} to get
-	 * @see #getReversedExtensions(Class)
 	 * @see #stream(Class)
 	 */
 	default <E extends Extension> List<E> getExtensions(Class<E> extensionType) {
 		return stream(extensionType).collect(toCollection(ArrayList::new));
 	}
 
-	/**
-	 * Get all {@code Extensions} of the specified type that are present
-	 * in this registry or one of its ancestors, in reverse order.
-	 *
-	 * @param extensionType the type of {@link Extension} to get
-	 * @see #getExtensions(Class)
-	 * @see #stream(Class)
-	 */
-	default <E extends Extension> List<E> getReversedExtensions(Class<E> extensionType) {
-		List<E> extensions = getExtensions(extensionType);
-		Collections.reverse(extensions);
-		return extensions;
-	}
-
 }

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java

@@ -130,7 +130,6 @@ public <E extends Extension> Stream<E> stream(Class<E> extensionType) {
 	 * <p>Extensions in ancestors are ignored.
 	 *
 	 * @param extensionType the type of {@link Extension} to stream
-	 * @see #getReversedExtensions(Class)
 	 */
 	private <E extends Extension> Stream<E> streamLocal(Class<E> extensionType) {
 		// @formatter:off