Skip to content
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.

Sign up for GitHub

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

ARQ-2231 The JUnit 5 container does not work with manual mode tests #546

Merged
merged 3 commits into from
Jun 28, 2024
Merged

ARQ-2231 The JUnit 5 container does not work with manual mode tests #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cfd111
Run formatter on ArquillianExtension.
rhusar Mar 26, 2024
3475cc3
Cleanup redundant modifiers in LifecycleMethodExecutor.
rhusar Mar 26, 2024
d85ecaa
ARQ-2231 Instead of implementing org.junit.jupiter.api.extension.Befo…
rhusar Mar 26, 2024
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
92 changes: 47 additions & 45 deletions junit5/core/src/main/java/org/jboss/arquillian/junit5/ArquillianExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
import org.jboss.arquillian.test.spi.TestMethodExecutor;
import org.jboss.arquillian.test.spi.TestResult;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.InvocationInterceptor;
import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
Expand All @@ -23,7 +21,7 @@
import static org.jboss.arquillian.junit5.ContextStore.getContextStore;
import static org.jboss.arquillian.junit5.JUnitJupiterTestClassLifecycleManager.getManager;

public class ArquillianExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, InvocationInterceptor, TestExecutionExceptionHandler {
public class ArquillianExtension implements BeforeAllCallback, AfterAllCallback, InvocationInterceptor, TestExecutionExceptionHandler {
public static final String RUNNING_INSIDE_ARQUILLIAN = "insideArquillian";

private static final String CHAIN_EXCEPTION_MESSAGE_PREFIX = "Chain of InvocationInterceptors never called invocation";
Expand All @@ -44,22 +42,6 @@ public void afterAll(ExtensionContext context) throws Exception {
LifecycleMethodExecutor.NO_OP);
}

@Override
public void beforeEach(ExtensionContext context) throws Exception {
getManager(context).getAdaptor().before(
context.getRequiredTestInstance(),
context.getRequiredTestMethod(),
LifecycleMethodExecutor.NO_OP);
}

@Override
public void afterEach(ExtensionContext context) throws Exception {
getManager(context).getAdaptor().after(
context.getRequiredTestInstance(),
context.getRequiredTestMethod(),
LifecycleMethodExecutor.NO_OP);
}

@Override
public void interceptTestTemplateMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext)) {
Expand Down Expand Up @@ -88,48 +70,68 @@ public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocatio
} else {
interceptInvocation(invocationContext, extensionContext);
getContextStore(extensionContext).getResult(extensionContext.getUniqueId())
.ifPresent(ExceptionUtils::throwAsUncheckedException);
.ifPresent(ExceptionUtils::throwAsUncheckedException);
}
}

@Override
public void interceptBeforeEachMethod(Invocation<Void> invocation,
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext) || isRunAsClient(extensionContext)) {
invocation.proceed();
} else {
invocation.skip();
}
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
// Instead of implementing org.junit.jupiter.api.extension.BeforeEachCallback.beforeEach handle events within the interceptor
if (IS_INSIDE_ARQUILLIAN.test(extensionContext) || isRunAsClient(extensionContext)) {
// Since the invocation is going to proceed, the invocation must happen within the context of SPI before()
getManager(extensionContext).getAdaptor().before(
extensionContext.getRequiredTestInstance(),
extensionContext.getRequiredTestMethod(),
invocation::proceed);
} else {
// Ensure the SPI before() is called, but given that the execution is going to be skipped
getManager(extensionContext).getAdaptor().before(
extensionContext.getRequiredTestInstance(),
extensionContext.getRequiredTestMethod(),
LifecycleMethodExecutor.NO_OP);

// and ensure that the contract of the org.junit.jupiter.api.extension.InvocationInterceptor will be fulfilled.
invocation.skip();
}
}

@Override
public void interceptAfterEachMethod(Invocation<Void> invocation,
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext) || isRunAsClient(extensionContext)) {
invocation.proceed();
} else {
invocation.skip();
}
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext) || isRunAsClient(extensionContext)) {
getManager(extensionContext).getAdaptor().after(
extensionContext.getRequiredTestInstance(),
extensionContext.getRequiredTestMethod(),
invocation::proceed);
} else {
getManager(extensionContext).getAdaptor().after(
extensionContext.getRequiredTestInstance(),
extensionContext.getRequiredTestMethod(),
LifecycleMethodExecutor.NO_OP);

invocation.skip();
}
}

@Override
public void interceptBeforeAllMethod(Invocation<Void> invocation,
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext)) {
invocation.skip();
} else {
invocation.proceed();
}
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext)) {
invocation.skip();
} else {
invocation.proceed();
}
}

@Override
public void interceptAfterAllMethod(Invocation<Void> invocation,
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext)) {
invocation.skip();
} else {
invocation.proceed();
}
ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
if (IS_INSIDE_ARQUILLIAN.test(extensionContext)) {
invocation.skip();
} else {
invocation.proceed();
}
}

@Override
Expand Down Expand Up @@ -172,7 +174,7 @@ private void populateResults(TestResult result, ExtensionContext context) {
ContextStore contextStore = getContextStore(context);
if (result.getThrowable() instanceof IdentifiedTestException) {
((IdentifiedTestException) result.getThrowable()).getCollectedExceptions()
.forEach(contextStore::storeResult);
.forEach(contextStore::storeResult);
} else {
contextStore.storeResult(context.getUniqueId(), result.getThrowable());
}
Expand Down
6 changes: 2 additions & 4 deletions test/spi/src/main/java/org/jboss/arquillian/test/spi/LifecycleMethodExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
* @version $Revision: $
*/
public interface LifecycleMethodExecutor {
public static final LifecycleMethodExecutor NO_OP = new LifecycleMethodExecutor() {
public void invoke() throws Throwable {
}
LifecycleMethodExecutor NO_OP = () -> {
};

void invoke() throws Throwable;
}
}