Lots of logging, lots of commented code, but continuous testing and gradle maybe both work?

Author: holly-cummins

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java

@@ -158,12 +158,12 @@ public Runnable prepare() {
             LogCapturingOutputFilter logHandler = new LogCapturingOutputFilter(testApplication, true, true,
                     TestSupport.instance()
                             .get()::isDisplayTestOutput);
-            // TODO do we want to do this setting of the TCCL? I think it just makes problems?
-            Thread.currentThread().setContextClassLoader(tcl);
 
+            System.out.println("HOLLY TCCL watch 1 " + Thread.currentThread().getContextClassLoader());
             Set<UniqueId> allDiscoveredIds = new HashSet<>();
             Set<UniqueId> dynamicIds = new HashSet<>();
             DiscoveryResult quarkusTestClasses = discoverTestClasses();
+            System.out.println("HOLLY TCCL watch 2 " + Thread.currentThread().getContextClassLoader());
 
             Launcher launcher = LauncherFactory.create(LauncherConfig.builder().build());
             LauncherDiscoveryRequestBuilder launchBuilder = LauncherDiscoveryRequestBuilder.request()
@@ -211,7 +211,12 @@ public FilterResult apply(TestDescriptor testDescriptor) {
 
             LauncherDiscoveryRequest request = launchBuilder
                     .build();
+            System.out.println("HOLLY TCCL watch 2a " + Thread.currentThread().getContextClassLoader());
+            Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
             TestPlan testPlan = launcher.discover(request);
+            System.out.println("HOLLY TCCL watch 3 " + Thread.currentThread().getContextClassLoader());
+            Thread.currentThread().setContextClassLoader(deploymentClassLoader);
+            System.out.println("HOLLY TCCL watch 4 " + Thread.currentThread().getContextClassLoader());
             long toRun = testPlan.countTestIdentifiers(TestIdentifier::isTest);
             for (TestRunListener listener : listeners) {
                 listener.runStarted(toRun);

test-framework/junit5-config/src/main/java/io/quarkus/test/config/ConfigLauncherSession.java

@@ -21,7 +21,13 @@ public void launcherSessionOpened(final LauncherSession session) {
         // before the formal loading phase. To make that work, the TCCL has to be
         // set to the FCL by the time this is called, even though we want config to live on the app classloader
         ClassLoader old = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
+        System.out.println("HOLLY creating config launcher, I am  " + this.getClass().getClassLoader());
+        System.out.println("HOLLY creating config launcher, TCCL is " + Thread.currentThread().getContextClassLoader());
+        if (old.toString().contains("Facade")) {
+            Thread.currentThread()
+                    .setContextClassLoader(ClassLoader.getSystemClassLoader());
+        }
+        System.out.println("HOLLY creating config launcher, second TCCL is " + Thread.currentThread().getContextClassLoader());
         try {
             TestConfigProviderResolver resolver = new TestConfigProviderResolver();
             ConfigProviderResolver.setInstance(resolver);

test-framework/junit5-config/src/main/java/io/quarkus/test/config/TestConfigProviderResolver.java

@@ -12,6 +12,7 @@
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.config.SmallRyeConfigBuilder;
+import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
 import io.smallrye.config.SmallRyeConfigProviderResolver;
 
 /**
@@ -53,6 +54,11 @@ public Config getConfig(final LaunchMode mode) {
             SmallRyeConfig config = configs.computeIfAbsent(mode, new Function<LaunchMode, SmallRyeConfig>() {
                 @Override
                 public SmallRyeConfig apply(final LaunchMode launchMode) {
+                    System.out.println((("HOLLY wull build, iam " + this.getClass()
+                            .getClassLoader() + " tccl"
+                            + Thread.currentThread()
+                                    .getContextClassLoader()
+                            + " condi" + SmallRyeConfigBuilderCustomizer.class.getClassLoader())));
                     return ConfigUtils.configBuilder(false, true, mode)
                             .withProfile(mode.getDefaultProfile())
                             .withMapping(TestConfig.class, "quarkus.test")

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

@@ -35,13 +35,13 @@ public <T> T intercept(Invocation<T> invocation) {
         // and causes some problems with config being set on the wrong classloader.
 
         // It's unclear if it's better to special-case gradle to reduce the impact, or be generic to make things consistent
-        if (System.getProperty("org.gradle.test.worker") != null) {
-            // This gets called several times; some for creation of LauncherSessionListener instances registered via the ServiceLoader mechanism,
-            // some for creation of Launcher instances, and some for calls to Launcher.discover(LauncherDiscoveryRequest), Launcher.execute(TestPlan, TestExecutionListener...), and Launcher.execute(LauncherDiscoveryRequest, TestExecutionListener...)
-            // We only know why it was called *after* calling invocation.proceed, sadly
-            // The Gradle classloading seems to happen immediately after the ConfigSessionListener is triggered, but before the next launch invocation
-            adjustContextClassLoader();
-        }
+        //   if (System.getProperty("org.gradle.test.worker") != null) {
+        // This gets called several times; some for creation of LauncherSessionListener instances registered via the ServiceLoader mechanism,
+        // some for creation of Launcher instances, and some for calls to Launcher.discover(LauncherDiscoveryRequest), Launcher.execute(TestPlan, TestExecutionListener...), and Launcher.execute(LauncherDiscoveryRequest, TestExecutionListener...)
+        // We only know why it was called *after* calling invocation.proceed, sadly
+        // The Gradle classloading seems to happen immediately after the ConfigSessionListener is triggered, but before the next launch invocation
+        //adjustContextClassLoader();
+        //    }
 
         return answer;