Ensure that dev services properties are cleared in QuarkusIntegration…

…TestExtension

This is needed to ensure the subsequent tests that need to relaunch dev-services
because of the use a different test profile

Fixes: quarkusio#27075
(cherry picked from commit a6a2c5d)

integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/DummyTestProfile.java

@@ -0,0 +1,6 @@
+package io.quarkus.it.mongodb;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+public class DummyTestProfile implements QuarkusTestProfile {
+}

integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/OtherProfileBookResourceIT.java

@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class OtherProfileBookResourceIT extends OtherProfileBookResourceTest {
+}

integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/OtherProfileBookResourceTest.java

@@ -0,0 +1,16 @@
+package io.quarkus.it.mongodb;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(DummyTestProfile.class)
+public class OtherProfileBookResourceTest {
+
+    @Test
+    public void testBlockingClient() {
+        Utils.callTheEndpoint("/books");
+    }
+}

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

@@ -120,6 +120,9 @@ private IntegrationTestExtensionState doNativeStart(ExtensionContext context, Cl
             Class<?> requiredTestClass = context.getRequiredTestClass();
 
             Map<String, String> sysPropRestore = getSysPropsToRestore();
+            for (String devServicesProp : devServicesProps.keySet()) {
+                sysPropRestore.put(devServicesProp, null); // used to signal that the property needs to be cleared
+            }
             TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
 
             testResourceManager = new TestResourceManager(requiredTestClass, quarkusTestProfile,

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

@@ -149,6 +149,9 @@ private IntegrationTestExtensionState doProcessStart(Properties quarkusArtifactP
             Class<?> requiredTestClass = context.getRequiredTestClass();
 
             Map<String, String> sysPropRestore = getSysPropsToRestore();
+            for (String devServicesProp : devServicesProps.keySet()) {
+                sysPropRestore.put(devServicesProp, null); // used to signal that the property needs to be cleared
+            }
             TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
 
             testResourceManager = new TestResourceManager(requiredTestClass, quarkusTestProfile,
@@ -175,7 +178,8 @@ private IntegrationTestExtensionState doProcessStart(Properties quarkusArtifactP
                     System.setProperty(i.getKey(), i.getValue());
                 }
             }
-            context.getStore(ExtensionContext.Namespace.GLOBAL).put(QuarkusIntegrationTestExtension.class.getName() + ".systemProps",
+            context.getStore(ExtensionContext.Namespace.GLOBAL).put(
+                    QuarkusIntegrationTestExtension.class.getName() + ".systemProps",
                     new ExtensionContext.Store.CloseableResource() {
                         @Override
                         public void close() throws Throwable {