Sort out GRPC regression by having orderer

holly-cummins · Dec 19, 2024 · 29568ba · 29568ba
1 parent 66daf33
commit 29568ba
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/test-framework/junit5-config/src/main/java/io/quarkus/test/config/QuarkusClassOrderer.java b/test-framework/junit5-config/src/main/java/io/quarkus/test/config/QuarkusClassOrderer.java
@@ -1,35 +1,56 @@
 package io.quarkus.test.config;
 
+import java.util.NoSuchElementException;
+
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.ClassOrdererContext;
+import org.junit.platform.commons.util.ReflectionUtils;
 
+import io.quarkus.deployment.dev.testing.TestConfig;
 import io.smallrye.config.SmallRyeConfig;
 
 /**
  * A JUnit {@link ClassOrderer}, used to delegate to a custom implementations of {@link ClassOrderer} set by Quarkus
  * config.
  */
 public class QuarkusClassOrderer implements ClassOrderer {
-    private final ClassOrderer delegate;
+    // TODO reinstate final
+    private ClassOrderer delegate;
 
     public QuarkusClassOrderer() {
         System.out.println("HOLLY class orderer TCCL is " + Thread.currentThread().getContextClassLoader());
         System.out.println("HOLLY I AM " + this.getClass().getClassLoader());
-        ClassLoader original = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+        //        ClassLoader original = Thread.currentThread().getContextClassLoader();
+        //  Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
         SmallRyeConfig config = ConfigProvider.getConfig().unwrap(SmallRyeConfig.class);
+
         // TODO obviously a bad idea, diagnostic
-        delegate = EMPTY;
-        //        TestConfig testConfig = config.getConfigMapping(TestConfig.class);
-        //
-        //        delegate = testConfig.classOrderer()
-        //                .map(klass -> ReflectionUtils.tryToLoadClass(klass)
-        //                        .andThenTry(ReflectionUtils::newInstance)
-        //                        .andThenTry(instance -> (ClassOrderer) instance)
-        //                        .toOptional().orElse(EMPTY))
-        //                .orElse(EMPTY);
-        Thread.currentThread().setContextClassLoader(original);
+        //        delegate = EMPTY;
+
+        try {
+            TestConfig testConfig = config.getConfigMapping(TestConfig.class);
+
+            delegate = testConfig.classOrderer()
+                    .map(klass -> ReflectionUtils.tryToLoadClass(klass)
+                            .andThenTry(ReflectionUtils::newInstance)
+                            .andThenTry(instance -> (ClassOrderer) instance)
+                            .toOptional()
+                            .orElse(EMPTY))
+                    .orElse(EMPTY);
+        } catch (NoSuchElementException e) {
+            e.printStackTrace();
+            // TODO this is a huge hack, fix this
+            // FIXME On the gradle tests, and maybe some others, the config is not there
+            System.out.println("HOLLY BAD BAD could not get config mapping for orderer, hardcoding a default");
+            String klass = "io.quarkus.test.junit.util.QuarkusTestProfileAwareClassOrderer";
+            delegate = ReflectionUtils.tryToLoadClass(klass)
+                    .andThenTry(ReflectionUtils::newInstance)
+                    .andThenTry(instance -> (ClassOrderer) instance)
+                    .toOptional()
+                    .orElse(EMPTY);
+        }
+        //   Thread.currentThread().setContextClassLoader(original);
     }
 
     @Override

diff --git a/.../junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java b/.../junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java
@@ -106,6 +106,7 @@ public QuarkusTestProfileAwareClassOrderer() {
 
     @Override
     public void orderClasses(ClassOrdererContext context) {
+        System.out.println("HOLLY YUP YUP ordering classes");
         // don't do anything if there is just one test class or the current order request is for @Nested tests
         if (context.getClassDescriptors()
                 .size() <= 1 || context.getClassDescriptors()