Respect annotation configuration values when comparing test resources

Author: sschmoeller

integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/configurable/ConfigurableLifecycleManager.java

@@ -0,0 +1,29 @@
+package io.quarkus.it.extension.configurable;
+
+import java.util.Map;
+
+import io.quarkus.it.extension.Counter;
+import io.quarkus.test.common.QuarkusTestResourceConfigurableLifecycleManager;
+
+public class ConfigurableLifecycleManager
+        implements QuarkusTestResourceConfigurableLifecycleManager<CustomResourceWithAttribute> {
+
+    String attributeValue;
+
+    @Override
+    public void init(CustomResourceWithAttribute annotation) {
+        attributeValue = annotation.value();
+    }
+
+    @Override
+    public Map<String, String> start() {
+        Counter.startCounter.incrementAndGet();
+        return Map.of("attributeValue", attributeValue);
+    }
+
+    @Override
+    public void stop() {
+        Counter.endCounter.incrementAndGet();
+    }
+
+}

integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/configurable/CustomResourceWithAttribute.java

@@ -0,0 +1,17 @@
+package io.quarkus.it.extension.configurable;
+
+import java.lang.annotation.*;
+
+import jakarta.enterprise.inject.Stereotype;
+
+import io.quarkus.test.common.QuarkusTestResource;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@QuarkusTestResource(ConfigurableLifecycleManager.class)
+@Stereotype
+public @interface CustomResourceWithAttribute {
+
+    String value();
+
+}

integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/configurable/WithAttributeEndTest.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.extension.configurable;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.it.extension.Counter;
+import io.quarkus.test.junit.QuarkusTest;
+
+@CustomResourceWithAttribute(value = "bar")
+@QuarkusTest
+public class WithAttributeEndTest {
+
+    @Test
+    public void test1() {
+        assertEquals("bar", ConfigProvider.getConfig().getValue("attributeValue", String.class));
+        assertTrue(Counter.endCounter.get() <= 1);
+    }
+
+    @Test
+    public void test2() {
+        assertTrue(Counter.endCounter.get() <= 1);
+    }
+
+}

integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/configurable/WithAttributeStartTest.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.extension.configurable;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.it.extension.Counter;
+import io.quarkus.test.junit.QuarkusTest;
+
+@CustomResourceWithAttribute(value = "foo")
+@QuarkusTest
+public class WithAttributeStartTest {
+
+    @Test
+    public void test1() {
+        assertEquals("foo", ConfigProvider.getConfig().getValue("attributeValue", String.class));
+        assertTrue(Counter.startCounter.get() <= 1);
+    }
+
+    @Test
+    public void test2() {
+        assertTrue(Counter.startCounter.get() <= 1);
+    }
+
+}

test-framework/common/src/main/java/io/quarkus/test/common/TestResourceManager.java

@@ -8,6 +8,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -349,12 +350,21 @@ public static Set<TestResourceManager.TestResourceComparisonInfo> testResourceCo
     }
 
     private static TestResourceComparisonInfo prepareTestResourceComparisonInfo(TestResourceClassEntry entry) {
-        Map<String, String> args;
+        Map<String, Object> args;
         if (entry.configAnnotation != null) {
             args = new HashMap<>(entry.args);
             args.put("configAnnotation", entry.configAnnotation.annotationType().getName());
+            Method[] annotationAttributes = entry.configAnnotation.annotationType().getDeclaredMethods();
+            for (Method annotationAttribute : annotationAttributes) {
+                try {
+                    args.put(annotationAttribute.getName(), annotationAttribute.invoke(entry.configAnnotation));
+                } catch (Exception e) {
+                    throw new RuntimeException("Unable to extract configuration values for annotation "
+                            + entry.configAnnotation.annotationType().getName(), e);
+                }
+            }
         } else {
-            args = entry.args;
+            args = new HashMap<>(entry.args);
         }
 
         return new TestResourceComparisonInfo(entry.testResourceLifecycleManagerClass().getName(), entry.getScope(),
@@ -648,7 +658,7 @@ public TestResourceScope getScope() {
     }
 
     public record TestResourceComparisonInfo(String testResourceLifecycleManagerClass, TestResourceScope scope,
-            Map<String, String> args) {
+            Map<String, Object> args) {
 
     }
 

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

@@ -243,7 +243,7 @@ static Set<TestResourceManager.TestResourceComparisonInfo> testResourceCompariso
                         testResourceScope = TestResourceScope.valueOf(originalTestResourceScope.toString());
                     }
                     Object originalArgs = entry.getClass().getMethod("args").invoke(entry);
-                    Map<String, String> args = (Map<String, String>) originalArgs;
+                    Map<String, Object> args = (Map<String, Object>) originalArgs;
                     result.add(new TestResourceManager.TestResourceComparisonInfo(testResourceLifecycleManagerClass,
                             testResourceScope, args));
                 }