Merge pull request #24440 from aloubyansky/test-plan-deployment-cl

Execute test plan with the deployment classloader as the TCCL
quarkusio · Mar 22, 2022 · 619288d · 619288d
2 parents 1fc794c + d052ee2
commit 619288d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
@@ -195,6 +195,7 @@ public FilterResult apply(TestDescriptor testDescriptor) {
             return new Runnable() {
                 @Override
                 public void run() {
+                    final ClassLoader origCl = Thread.currentThread().getContextClassLoader();
                     try {
                         synchronized (JunitTestRunner.this) {
                             testsRunning = true;
@@ -222,6 +223,8 @@ public void quarkusStarting() {
 
                         Map<String, Map<UniqueId, TestResult>> resultsByClass = new HashMap<>();
                         AtomicReference<TestIdentifier> currentNonDynamicTest = new AtomicReference<>();
+
+                        Thread.currentThread().setContextClassLoader(tcl);
                         launcher.execute(testPlan, new TestExecutionListener() {
 
                             @Override
@@ -396,6 +399,7 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
                                 throw new RuntimeException(e);
                             }
                         } finally {
+                            Thread.currentThread().setContextClassLoader(origCl);
                             synchronized (JunitTestRunner.this) {
                                 testsRunning = false;
                                 if (aborted) {