Skip to content

Consolidate duplicated logic #4639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* https://www.eclipse.org/legal/epl-v20.html
*/

import java.util.Objects;
import java.util.List;
package org.junit.jupiter.engine.descriptor;

import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
Expand All @@ -23,30 +25,50 @@
*/
class CallbackSupport {

static <T extends Extension> void invokeBeforeCallbacks(Class<T> type, JupiterEngineExecutionContext context,
CallbackInvoker<T> callbackInvoker) {
private static <T extends Extension> void invokeCallbacks(List<T> extensions,
ExtensionContext extensionContext, ThrowableCollector collector, CallbackInvoker<T> invoker, boolean reverse, boolean breakOnPossibleException){

ExtensionRegistry registry = context.getExtensionRegistry();
ExtensionContext extensionContext = context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector();

for (T callback : registry.getExtensions(type)) {
throwableCollector.execute(() -> callbackInvoker.invoke(callback, extensionContext));
if (throwableCollector.isNotEmpty()) {
break;
if(reverse){
forEachInReverseOrder(extensions, ext -> collector.execute(() -> invoker.invoke(ext, extensionContext)));
}else{
for(T ext: extensions){
collector.execute(()-> invoker.invoke(ext, extensionContext));
if (breakOnPossibleException && collector.isNotEmpty()) break;
}
}
}

static <T extends Extension> void invokeAfterCallbacks(Class<T> type, JupiterEngineExecutionContext context,
static <T extends Extension> void invokeBeforeCallbacks(Class<T> type, JupiterEngineExecutionContext context,
CallbackInvoker<T> callbackInvoker) {

Objects.requireNonNull(type, "type must not be null");
Objects.requireNonNull(context, "context must not be null");
Objects.requireNonNull(callbackInvoker, "callbackInvoker must not be null");

invokeCallbacks(
context.getExtensionRegistry().getExtensions(type),
context.getExtensionContext(),
context.getThrowableCollector(),
false, // forward order on callbacks
true //break out on any first exception encountered
)
}

ExtensionRegistry registry = context.getExtensionRegistry();
ExtensionContext extensionContext = context.getExtensionContext();
ThrowableCollector throwableCollector = context.getThrowableCollector();
static <T extends Extension> void invokeAfterCallbacks(Class<T> type, JupiterEngineExecutionContext context,
CallbackInvoker<T> callbackInvoker) {

Objects.requireNonNull(type, "type must not be null");
Objects.requireNonNull(context, "context must not be null");
Objects.requireNonNull(callbackInvoker, "callbackInvoker must not be null");

forEachInReverseOrder(registry.getExtensions(type), //
callback -> throwableCollector.execute(() -> callbackInvoker.invoke(callback, extensionContext)));
invokeCallbacks(
context.getExtensionRegistry().getExtensions(type),
context.getExtensionContext(),
context.getThrowableCollector(),
true, // reverse order on callbacks
false // allow all the callbacks to run.
)

}

@FunctionalInterface
Expand Down
Loading