Recalculate config property names during tests

(cherry picked from commit a1cf7a0)
quarkusio · Feb 4, 2025 · ec92a71 · ec92a71
1 parent 1292be5
commit ec92a71
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java
@@ -4,7 +4,10 @@
 import java.io.IOException;
 import java.util.Map;
 
+import org.eclipse.microprofile.config.ConfigProvider;
+
 import io.quarkus.test.common.TestResourceManager;
+import io.smallrye.config.SmallRyeConfig;
 
 public class IntegrationTestExtensionState extends QuarkusTestExtensionState {
 
@@ -28,5 +31,7 @@ protected void doClose() throws IOException {
                 System.setProperty(entry.getKey(), val);
             }
         }
+        // recalculate the property names that may have changed with the restore
+        ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getLatestPropertyNames();
     }
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
@@ -53,6 +53,7 @@
 import io.quarkus.test.common.TestClassIndexer;
 import io.quarkus.test.common.TestResourceManager;
 import io.quarkus.test.common.http.TestHTTPResourceManager;
+import io.smallrye.config.SmallRyeConfig;
 
 public final class IntegrationTestUtil {
 
@@ -146,6 +147,8 @@ static TestProfileAndProperties determineTestProfileAndProperties(Class<? extend
                 System.setProperty(i.getKey(), i.getValue());
             }
         }
+        // recalculate the property names that may have changed
+        ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getLatestPropertyNames();
         return new TestProfileAndProperties(testProfile, properties);
     }
 

diff --git a/...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java b/...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
@@ -263,10 +263,14 @@ public void close() throws Throwable {
                                 } else {
                                     System.setProperty(i.getKey(), i.getValue());
                                 }
+                                // recalculate the property names that may have changed with the restore
+                                ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getLatestPropertyNames();
                             }
                         }
                     });
             additionalProperties.putAll(resourceManagerProps);
+            // recalculate the property names that may have changed with testProfileAndProperties.properties
+            ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getLatestPropertyNames();
 
             ArtifactLauncher<?> launcher;
             String testHost = System.getProperty("quarkus.http.test-host");

diff --git a/...ework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java b/...ework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
@@ -154,6 +154,8 @@ private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, S
                     }
                 }
                 additionalProperties.putAll(resourceManagerProps);
+                // recalculate the property names that may have changed with testProfileAndProperties.properties
+                ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getLatestPropertyNames();
 
                 testResourceManager.inject(context.getRequiredTestInstance());
 
@@ -187,6 +189,8 @@ private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, S
                         System.setProperty(i.getKey(), i.getValue());
                     }
                 }
+                // recalculate the property names that may have changed with the restore
+                ConfigProvider.getConfig().unwrap(SmallRyeConfig.class).getLatestPropertyNames();
                 try {
                     if (testResourceManager != null) {
                         testResourceManager.close();