WIP for JUnit 5.10

Author: holly-cummins

bom/application/pom.xml

@@ -139,7 +139,7 @@
         <db2-jdbc.version>11.5.8.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <rest-assured.version>5.3.0</rest-assured.version>
-        <junit.jupiter.version>5.9.3</junit.jupiter.version>
+        <junit.jupiter.version>5.10.0-RC1</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
         <infinispan.version>14.0.11.Final</infinispan.version>
         <infinispan.protostream.version>4.6.2.Final</infinispan.protostream.version>

independent-projects/bootstrap/pom.xml

@@ -47,7 +47,7 @@
         <assertj.version>3.24.2</assertj.version>
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.5.1.Final</jboss-logging.version>
-        <junit.jupiter.version>5.9.3</junit.jupiter.version>
+        <junit.jupiter.version>5.10.0-RC1</junit.jupiter.version>
         <maven-core.version>3.9.3</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.3.5</sisu.version><!-- Keep in sync with maven-core.version -->
         <maven-plugin-annotations.version>3.7.1</maven-plugin-annotations.version>

independent-projects/extension-maven-plugin/pom.xml

@@ -45,7 +45,7 @@
         <maven-plugin-plugin.version>3.8.1</maven-plugin-plugin.version>
         <jackson-bom.version>2.15.2</jackson-bom.version>
         <smallrye-beanbag.version>1.3.2</smallrye-beanbag.version>
-        <junit.jupiter.version>5.9.3</junit.jupiter.version>
+        <junit.jupiter.version>5.10.0-RC1</junit.jupiter.version>
     </properties>
     <build>
         <testResources>

independent-projects/tools/pom.xml

@@ -55,7 +55,7 @@
         <assertj.version>3.24.2</assertj.version>
         <jackson-bom.version>2.15.2</jackson-bom.version>
         <jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
-        <junit.version>5.9.3</junit.version>
+        <junit.version>5.10.0-M1</junit.version>
         <commons-compress.version>1.23.0</commons-compress.version>
         <jboss-logging.version>3.5.1.Final</jboss-logging.version>
         <mockito.version>5.3.1</mockito.version>

test-framework/junit5-properties/src/main/resources/junit-platform.properties

@@ -1,2 +1,3 @@
 junit.jupiter.extensions.autodetection.enabled=true
 junit.jupiter.testclass.order.default=io.quarkus.test.junit.util.QuarkusTestProfileAwareClassOrderer
+junit.platform.launcher.interceptors.enabled=true

test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java

@@ -254,9 +254,9 @@ public static boolean hasPerTestResources(Class<?> requiredTestClass) {
         return false;
     }
 
-    protected static class PrepareResult {
-        protected final AugmentAction augmentAction;
-        protected final QuarkusTestProfile profileInstance;
+    public static class PrepareResult {
+        public final AugmentAction augmentAction;
+        public final QuarkusTestProfile profileInstance;
         protected final CuratedApplication curatedApplication;
         protected final Path testClassLocation;
 

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java

@@ -221,6 +221,7 @@ public Thread newThread(Runnable r) {
 
             testHttpEndpointProviders = TestHttpEndpointProvider.load();
             StartupAction startupAction = augmentAction.createInitialRuntimeApplication();
+            System.out.println("HOLLY startup classloader is " + startupAction.getClassLoader());
             Thread.currentThread().setContextClassLoader(startupAction.getClassLoader());
             populateDeepCloneField(startupAction);
 
@@ -355,6 +356,7 @@ private void shutdownHangDetection() {
     }
 
     private void populateDeepCloneField(StartupAction startupAction) {
+        System.out.println("HOLLY making deep cloner");
         deepClone = new SerializationWithXStreamFallbackDeepClone(startupAction.getClassLoader());
     }
 
@@ -373,6 +375,7 @@ private void populateTestMethodInvokers(ClassLoader quarkusClassLoader) {
 
     @Override
     public void beforeTestExecution(ExtensionContext context) throws Exception {
+        System.out.println("HOLLY before test exevcution" + context.getRequiredTestClass().getClassLoader());
         if (isNativeOrIntegrationTest(context.getRequiredTestClass()) || isBeforeTestCallbacksEmpty()) {
             return;
         }
@@ -392,6 +395,7 @@ public void beforeTestExecution(ExtensionContext context) throws Exception {
 
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
+        System.out.println("HOLLY before each" + context.getRequiredTestClass().getClassLoader());
         if (isNativeOrIntegrationTest(context.getRequiredTestClass())) {
             return;
         }
@@ -644,6 +648,7 @@ private void throwBootFailureException() {
 
     @Override
     public void beforeAll(ExtensionContext context) throws Exception {
+        System.out.println("HOLLY before all" + context.getRequiredTestClass().getClassLoader());
         GroovyClassValue.disable();
         currentTestClassStack.push(context.getRequiredTestClass());
         //set the right launch mode in the outer CL, used by the HTTP host config source
@@ -689,6 +694,8 @@ public void interceptBeforeAllMethod(Invocation<Void> invocation, ReflectiveInvo
             invocation.proceed();
             return;
         }
+
+        System.out.println("HOLLY HI Bintercept bEFORE ALL " + invocationContext.getTargetClass().getClassLoader());
         resetHangTimeout();
         ensureStarted(extensionContext);
         if (failedBoot) {
@@ -916,6 +923,7 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
 
         ClassLoader old = setCCL(runningQuarkusApplication.getClassLoader());
         try {
+            System.out.println("HOLLY the actual test class is " + extensionContext.getRequiredTestClass().getClassLoader());
             Class<?> testClassFromTCCL = Class.forName(extensionContext.getRequiredTestClass().getName(), true,
                     Thread.currentThread().getContextClassLoader());
             Map<Class<?>, Object> allTestsClasses = new HashMap<>();
@@ -963,6 +971,7 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
                 boolean cloneRequired = false;
                 Object replacement = null;
                 Class<?> argClass = parameters[i].getType();
+                System.out.println("HOLLY checking clone on " + argClass + "<-" + argClass.getClassLoader());
                 if (arg != null) {
                     Class<?> theclass = argClass;
                     while (theclass.isArray()) {
@@ -982,6 +991,8 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
                         cloneRequired = true;
                     } else {
                         try {
+                            System.out.println("comparing " + theclass.getClassLoader() + " vs "
+                                    + runningQuarkusApplication.getClassLoader());
                             cloneRequired = runningQuarkusApplication.getClassLoader()
                                     .loadClass(theclass.getName()) != theclass;
                         } catch (ClassNotFoundException e) {
@@ -997,7 +1008,9 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
                 if (replacement != null) {
                     argumentsFromTccl.add(replacement);
                 } else if (cloneRequired) {
-                    argumentsFromTccl.add(deepClone.clone(arg));
+                    // argumentsFromTccl.add(deepClone.clone(arg));
+                    argumentsFromTccl.add(arg);
+                    System.err.println("HOLLY NOT DOING CLONE");
                 } else if (testMethodInvokerToUse != null) {
                     argumentsFromTccl.add(testMethodInvokerToUse.getClass().getMethod("methodParamInstance", String.class)
                             .invoke(testMethodInvokerToUse, argClass.getName()));