Add around() to Node to allow intercepting the whole execution

Co-authored-by: Marc Philipp <[email protected]>

Author: leonard84

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java

@@ -120,6 +120,20 @@ default C execute(C context, DynamicTestExecutor dynamicTestExecutor) throws Exc
 	default void after(C context) throws Exception {
 	}
 
+	/**
+	 * Wraps around the invocation of {@link #before(EngineExecutionContext)},
+	 * {@link #execute(EngineExecutionContext, DynamicTestExecutor)}, and
+	 * {@link #after(EngineExecutionContext)}.
+	 *
+	 * @param context context the context to execute in
+	 * @param invocation the wrapped invocation (must be invoked exactly once)
+	 * @since 1.4
+	 */
+	@API(status = EXPERIMENTAL, since = "1.4")
+	default void around(C context, Invocation<C> invocation) throws Exception {
+		invocation.invoke(context);
+	}
+
 	/**
 	 * Get the set of {@linkplain ExclusiveResource exclusive resources}
 	 * required to execute this node.
@@ -282,4 +296,20 @@ enum ExecutionMode {
 		CONCURRENT
 	}
 
+	/**
+	 * Represents an invocation that runs with the supplied context.
+	 *
+	 * @param <C> the type of {@code EngineExecutionContext} used by the {@code HierarchicalTestEngine}
+	 * @since 1.4
+	 */
+	@API(status = EXPERIMENTAL, since = "1.4")
+	interface Invocation<C extends EngineExecutionContext> {
+
+		/**
+		 * Invoke this invocation with the supplied context.
+		 *
+		 * @param context the context to invoke in
+		 */
+		void invoke(C context) throws Exception;
+	}
 }

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java

@@ -115,26 +115,31 @@ private void executeRecursively() {
 		started = true;
 
 		throwableCollector.execute(() -> {
-			// @formatter:off
-			List<NodeTestTask<C>> children = testDescriptor.getChildren().stream()
-					.map(descriptor -> new NodeTestTask<C>(taskContext, descriptor))
-					.collect(toCollection(ArrayList::new));
-			// @formatter:on
-
-			context = node.before(context);
-
-			DynamicTestExecutor dynamicTestExecutor = new DefaultDynamicTestExecutor();
-			context = node.execute(context, dynamicTestExecutor);
-
-			if (!children.isEmpty()) {
-				children.forEach(child -> child.setParentContext(context));
-				taskContext.getExecutorService().invokeAll(children);
-			}
-
-			dynamicTestExecutor.awaitFinished();
+			node.around(context, ctx -> {
+				context = ctx;
+				throwableCollector.execute(() -> {
+					// @formatter:off
+					List<NodeTestTask<C>> children = testDescriptor.getChildren().stream()
+							.map(descriptor -> new NodeTestTask<C>(taskContext, descriptor))
+							.collect(toCollection(ArrayList::new));
+					// @formatter:on
+
+					context = node.before(context);
+
+					final DynamicTestExecutor dynamicTestExecutor = new DefaultDynamicTestExecutor();
+					context = node.execute(context, dynamicTestExecutor);
+
+					if (!children.isEmpty()) {
+						children.forEach(child -> child.setParentContext(context));
+						taskContext.getExecutorService().invokeAll(children);
+					}
+
+					throwableCollector.execute(dynamicTestExecutor::awaitFinished);
+				});
+
+				throwableCollector.execute(() -> node.after(context));
+			});
 		});
-
-		throwableCollector.execute(() -> node.after(context));
 	}
 
 	private void cleanUp() {