Merge pull request #47426 from holly-cummins/handle-tccl-setting-for-method-source

Only reset the test TCCL in cases where we had changed it

Author: gsmet

integration-tests/main/src/test/java/io/quarkus/it/main/MethodSourceTest.java

@@ -8,6 +8,7 @@
 
 import jakarta.inject.Inject;
 
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -28,6 +29,9 @@ public class MethodSourceTest {
     public void testParameterResolver(UnusedBean.DummyInput dummyInput, Matcher<String> matcher) {
         UnusedBean.DummyResult dummyResult = unusedBean.dummy(dummyInput);
         assertThat(dummyResult.getResult(), matcher);
+
+        // Can we get config?
+        ConfigProvider.getConfig();
     }
 
     private static Collection<Arguments> provideDummyInput() {

integration-tests/maven/pom.xml

@@ -74,6 +74,14 @@
             <artifactId>quarkus-vertx-http-dev-ui-tests</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- This one is used by the tested projects so we need to create a dependency
+        to make sure GIB triggers the testing. --> 
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-project-core-extension-codestarts</artifactId>

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

@@ -25,14 +25,12 @@ public void executionStarted(TestIdentifier testIdentifier) {
         Optional<TestSource> oSource = testIdentifier.getSource();
         if (oSource.isPresent()) {
             TestSource source = oSource.get();
-            if (source instanceof ClassSource) {
-                ClassSource cs = (ClassSource) source;
+            if (source instanceof ClassSource cs) {
                 ClassLoader classLoader = cs.getJavaClass().getClassLoader();
                 // Only adjust the TCCL in cases where we know the QuarkusTestExtension would be about to do it anyway
                 // We could check annotations, but that would be slow, and the assumption that only Quarkus Tests are loaded with the quarkus classloader should be a fair one
                 if (classLoader instanceof QuarkusClassLoader) {
-                    origCl = Thread.currentThread()
-                            .getContextClassLoader();
+                    origCl = Thread.currentThread().getContextClassLoader();
                     Thread.currentThread().setContextClassLoader(classLoader);
                 } else {
                     origCl = null;
@@ -43,9 +41,15 @@ public void executionStarted(TestIdentifier testIdentifier) {
 
     @Override
     public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult result) {
-        if (origCl != null) {
-            // If execution is parallel this could be odd, but if execution is parallel any kind of TCCL manipulation will be ill-fated
-            Thread.currentThread().setContextClassLoader(origCl);
+        Optional<TestSource> oSource = testIdentifier.getSource();
+        if (oSource.isPresent()) {
+            TestSource source = oSource.get();
+            if (source instanceof ClassSource) {
+                if (origCl != null) {
+                    // If execution is parallel this could produce odd results, but if execution is parallel any kind of TCCL manipulation will be ill-fated
+                    Thread.currentThread().setContextClassLoader(origCl);
+                }
+            }
         }
     }
 }