Merge pull request #14352 from geoand/test-beforeclass-cl

Ensure that QuarkusTestBeforeClassCallback is run on the Quarkus Classloader
quarkusio · Jan 18, 2021 · 03bb925 · 03bb925
2 parents fefa67c + 900c90c
commit 03bb925
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/...sts/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeClassCallback.java b/...sts/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeClassCallback.java
@@ -2,6 +2,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.jupiter.api.Assertions;
+
 import io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback;
 
 public class SimpleAnnotationCheckerBeforeClassCallback implements QuarkusTestBeforeClassCallback {
@@ -10,11 +12,17 @@ public class SimpleAnnotationCheckerBeforeClassCallback implements QuarkusTestBe
 
     @Override
     public void beforeClass(Class<?> testClass) {
+        assertQuarkusClassLoader(Thread.currentThread().getContextClassLoader());
+        assertQuarkusClassLoader(testClass.getClassLoader());
         // make sure that this comes into play only for the test we care about
         if (!testClass.getName().endsWith("QuarkusTestCallbacksTestCase")) {
             return;
         }
 
         count.incrementAndGet();
     }
+
+    private void assertQuarkusClassLoader(ClassLoader contextClassLoader) {
+        Assertions.assertTrue(contextClassLoader.getClass().getName().contains("QuarkusClassLoader"));
+    }
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -647,10 +647,25 @@ public <T> T interceptTestClassConstructor(Invocation<T> invocation,
         T result;
         ClassLoader old = Thread.currentThread().getContextClassLoader();
         Class<?> requiredTestClass = extensionContext.getRequiredTestClass();
-        for (Object beforeClassCallback : beforeClassCallbacks) {
-            beforeClassCallback.getClass().getMethod("beforeClass", Class.class).invoke(beforeClassCallback,
-                    requiredTestClass);
+
+        if (runningQuarkusApplication != null) {
+            try {
+                Thread.currentThread().setContextClassLoader(runningQuarkusApplication.getClassLoader());
+                for (Object beforeClassCallback : beforeClassCallbacks) {
+                    beforeClassCallback.getClass().getMethod("beforeClass", Class.class).invoke(beforeClassCallback,
+                            runningQuarkusApplication.getClassLoader().loadClass(requiredTestClass.getName()));
+                }
+            } finally {
+                Thread.currentThread().setContextClassLoader(old);
+            }
+        } else {
+            // can this ever happen?
+            for (Object beforeClassCallback : beforeClassCallbacks) {
+                beforeClassCallback.getClass().getMethod("beforeClass", Class.class).invoke(beforeClassCallback,
+                        requiredTestClass);
+            }
         }
+
         try {
             Thread.currentThread().setContextClassLoader(requiredTestClass.getClassLoader());
             result = invocation.proceed();