Merge pull request #20223 from geoand/#20205

Make @testprofile work with integration tests
quarkusio · Sep 18, 2021 · 15c2f12 · 15c2f12
2 parents 6de7b3f + 3221e8e
commit 15c2f12
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/AppTestProfile.java b/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/AppTestProfile.java
@@ -0,0 +1,14 @@
+package org.acme.quickstart.lra;
+
+import java.util.List;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+// we use a QuarkusTestProfile to ensure that QuarkusIntegrationTest works properly with them
+public class AppTestProfile implements QuarkusTestProfile {
+
+    @Override
+    public List<TestResourceEntry> testResources() {
+        return List.of(new TestResourceEntry(LRAParticipantTestResourceLifecycle.class));
+    }
+}
diff --git a/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTest.java b/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTest.java
@@ -19,13 +19,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
 import io.restassured.response.Response;
 
 @QuarkusTest
-@QuarkusTestResource(LRAParticipantTestResourceLifecycle.class)
+@TestProfile(AppTestProfile.class)
 @TestHTTPEndpoint(TransactionalResource.class)
 public class LRAParticipantTest {
     private String coordinatorEndpoint;

diff --git a/...-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTestNativeIT.java b/...-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTestNativeIT.java
@@ -1,7 +1,9 @@
 package org.acme.quickstart.lra;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
+import io.quarkus.test.junit.TestProfile;
 
 @QuarkusIntegrationTest
+@TestProfile(AppTestProfile.class)
 public class LRAParticipantTestNativeIT extends LRAParticipantTest {
 }
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
@@ -4,6 +4,7 @@
 import static io.quarkus.test.junit.IntegrationTestUtil.determineTestProfileAndProperties;
 import static io.quarkus.test.junit.IntegrationTestUtil.doProcessTestInstance;
 import static io.quarkus.test.junit.IntegrationTestUtil.ensureNoInjectAnnotationIsUsed;
+import static io.quarkus.test.junit.IntegrationTestUtil.getAdditionalTestResources;
 import static io.quarkus.test.junit.IntegrationTestUtil.getSysPropsToRestore;
 import static io.quarkus.test.junit.IntegrationTestUtil.handleDevServices;
 import static io.quarkus.test.junit.IntegrationTestUtil.readQuarkusArtifactProperties;
@@ -132,7 +133,9 @@ private IntegrationTestExtensionState doProcessStart(Properties quarkusArtifactP
             TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
 
             testResourceManager = new TestResourceManager(requiredTestClass, quarkusTestProfile,
-                    Collections.emptyList(), testProfileAndProperties.testProfile != null
+                    getAdditionalTestResources(testProfileAndProperties.testProfile,
+                            context.getRequiredTestClass().getClassLoader()),
+                    testProfileAndProperties.testProfile != null
                             && testProfileAndProperties.testProfile.disableGlobalTestResources(),
                     devServicesProps);
             testResourceManager.init();

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
@@ -2,14 +2,14 @@
 
 import static io.quarkus.test.junit.IntegrationTestUtil.determineBuildOutputDirectory;
 import static io.quarkus.test.junit.IntegrationTestUtil.determineTestProfileAndProperties;
+import static io.quarkus.test.junit.IntegrationTestUtil.getAdditionalTestResources;
 import static io.quarkus.test.junit.IntegrationTestUtil.getSysPropsToRestore;
 import static io.quarkus.test.junit.IntegrationTestUtil.handleDevServices;
 import static io.quarkus.test.junit.IntegrationTestUtil.readQuarkusArtifactProperties;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -114,7 +114,9 @@ private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, S
                 TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
 
                 testResourceManager = new TestResourceManager(requiredTestClass, profile,
-                        Collections.emptyList(), testProfileAndProperties.testProfile != null
+                        getAdditionalTestResources(testProfileAndProperties.testProfile,
+                                context.getRequiredTestClass().getClassLoader()),
+                        testProfileAndProperties.testProfile != null
                                 && testProfileAndProperties.testProfile.disableGlobalTestResources());
                 testResourceManager.init();
                 Map<String, String> additionalProperties = new HashMap<>(testProfileAndProperties.properties);