Polishing

junit-team · Jun 7, 2019 · e73a7f4 · e73a7f4
1 parent f950f4e
commit e73a7f4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/...piter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/...piter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
@@ -222,6 +222,9 @@ public void cleanUp(JupiterEngineExecutionContext context) throws Exception {
 		context.close();
 	}
 
+	/**
+	 * @since 5.5
+	 */
 	@FunctionalInterface
 	interface ExceptionHandlerInvoker<T extends Extension> {
 

diff --git a/...er-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/...er-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -17,7 +17,6 @@
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 
 import org.apiguardian.api.API;
@@ -47,7 +46,6 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
-import org.junit.platform.engine.support.hierarchical.ThrowableCollector.Executable;
 
 /**
  * {@link TestDescriptor} for {@link org.junit.jupiter.api.Test @Test} methods.
@@ -149,13 +147,13 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte
 
 	private void invokeBeforeEachCallbacks(JupiterEngineExecutionContext context) {
 		invokeBeforeMethodsOrCallbacksUntilExceptionOccurs(BeforeEachCallback.class, context,
-			(extensionContext, callback) -> () -> callback.beforeEach(extensionContext));
+			(callback, extensionContext) -> callback.beforeEach(extensionContext));
 	}
 
 	private void invokeBeforeEachMethods(JupiterEngineExecutionContext context) {
 		ExtensionRegistry registry = context.getExtensionRegistry();
 		invokeBeforeMethodsOrCallbacksUntilExceptionOccurs(BeforeEachMethodAdapter.class, context,
-			(extensionContext, adapter) -> () -> {
+			(adapter, extensionContext) -> {
 				try {
 					adapter.invokeBeforeEachMethod(extensionContext, registry);
 				}
@@ -174,19 +172,18 @@ private void invokeBeforeEachExecutionExceptionHandlers(ExtensionContext context
 
 	private void invokeBeforeTestExecutionCallbacks(JupiterEngineExecutionContext context) {
 		invokeBeforeMethodsOrCallbacksUntilExceptionOccurs(BeforeTestExecutionCallback.class, context,
-			(extensionContext, callback) -> () -> callback.beforeTestExecution(extensionContext));
+			(callback, extensionContext) -> callback.beforeTestExecution(extensionContext));
 	}
 
 	private <T extends Extension> void invokeBeforeMethodsOrCallbacksUntilExceptionOccurs(Class<T> type,
-			JupiterEngineExecutionContext context, BiFunction<ExtensionContext, T, Executable> generator) {
+			JupiterEngineExecutionContext context, CallbackInvoker<T> callbackInvoker) {
 
 		ExtensionRegistry registry = context.getExtensionRegistry();
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
 		for (T callback : registry.getExtensions(type)) {
-			Executable executable = generator.apply(extensionContext, callback);
+			throwableCollector.execute(() -> callbackInvoker.invoke(callback, extensionContext));
-			throwableCollector.execute(executable);
 			if (throwableCollector.isNotEmpty()) {
 				break;
 			}
@@ -220,12 +217,12 @@ private void invokeTestExecutionExceptionHandlers(ExtensionRegistry registry, Ex
 
 	private void invokeAfterTestExecutionCallbacks(JupiterEngineExecutionContext context) {
 		invokeAllAfterMethodsOrCallbacks(AfterTestExecutionCallback.class, context,
-			(extensionContext, callback) -> () -> callback.afterTestExecution(extensionContext));
+			(callback, extensionContext) -> callback.afterTestExecution(extensionContext));
 	}
 
 	private void invokeAfterEachMethods(JupiterEngineExecutionContext context) {
 		ExtensionRegistry registry = context.getExtensionRegistry();
-		invokeAllAfterMethodsOrCallbacks(AfterEachMethodAdapter.class, context, (extensionContext, adapter) -> () -> {
+		invokeAllAfterMethodsOrCallbacks(AfterEachMethodAdapter.class, context, (adapter, extensionContext) -> {
 			try {
 				adapter.invokeAfterEachMethod(extensionContext, registry);
 			}
@@ -244,19 +241,18 @@ private void invokeAfterEachExecutionExceptionHandlers(ExtensionContext context,
 
 	private void invokeAfterEachCallbacks(JupiterEngineExecutionContext context) {
 		invokeAllAfterMethodsOrCallbacks(AfterEachCallback.class, context,
-			(extensionContext, callback) -> () -> callback.afterEach(extensionContext));
+			(callback, extensionContext) -> callback.afterEach(extensionContext));
 	}
 
 	private <T extends Extension> void invokeAllAfterMethodsOrCallbacks(Class<T> type,
-			JupiterEngineExecutionContext context, BiFunction<ExtensionContext, T, Executable> generator) {
+			JupiterEngineExecutionContext context, CallbackInvoker<T> callbackInvoker) {
 
 		ExtensionRegistry registry = context.getExtensionRegistry();
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
 		registry.getReversedExtensions(type).forEach(callback -> {
-			Executable executable = generator.apply(extensionContext, callback);
+			throwableCollector.execute(() -> callbackInvoker.invoke(callback, extensionContext));
-			throwableCollector.execute(executable);
 		});
 	}
 
@@ -336,4 +332,14 @@ private void invokeTestWatchers(JupiterEngineExecutionContext context, boolean r
 		});
 	}
 
+	/**
+	 * @since 5.5
+	 */
+	@FunctionalInterface
+	private interface CallbackInvoker<T extends Extension> {
+
+		void invoke(T t, ExtensionContext context) throws Throwable;
+
+	}
+
 }