Replace quarkus-test-artemis with dev services container

apache · Sep 2, 2024 · bc53ae5 · bc53ae5
1 parent 244d6c9
commit bc53ae5
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 107 deletions.
diff --git a/jms-jpa/pom.xml b/jms-jpa/pom.xml
@@ -136,11 +136,6 @@
             <artifactId>quarkus-test-h2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkiverse.artemis</groupId>
-            <artifactId>quarkus-test-artemis</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>

diff --git a/jms-jpa/src/main/resources/application.properties b/jms-jpa/src/main/resources/application.properties
@@ -45,7 +45,6 @@ camel.rest.context-path=/api
 
 # Quarkus Artemis
 quarkus.artemis.enabled=true
-%test.quarkus.artemis.devservices.enabled=false
 #%prod.quarkus.artemis.url=tcp://localhost:61616
 #%prod.quarkus.artemis.username=admin
 #%prod.quarkus.artemis.password=admin

diff --git a/jms-jpa/src/test/java/org/acme/JtaTest.java b/jms-jpa/src/test/java/org/acme/JtaTest.java
@@ -19,7 +19,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.artemis.test.ArtemisTestResource;
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -31,7 +30,6 @@
 
 @QuarkusTest
 @WithTestResource(H2DatabaseTestResource.class)
-@WithTestResource(ArtemisTestResource.class)
 public class JtaTest {
     @Test
     public void testXA() {

diff --git a/jms-jpa/src/test/resources/broker.xml b/jms-jpa/src/test/resources/broker.xml
diff --git a/message-bridge/pom.xml b/message-bridge/pom.xml
@@ -124,12 +124,6 @@
             <artifactId>camel-quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkiverse.artemis</groupId>
-            <artifactId>quarkus-test-artemis</artifactId>
-            <version>${quarkus-artemis-jms.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>

diff --git a/message-bridge/src/main/java/org/acme/message/bridge/Producers.java b/message-bridge/src/main/java/org/acme/message/bridge/Producers.java
@@ -90,7 +90,7 @@ JmsComponent ibmmq(@Identifier("ibmConnectionFactory") ConnectionFactory cf, Jta
      * @return    a new JmsComponent instance
      */
     @Identifier("amq")
-    JmsComponent amq(@Identifier("amqConnectionFactory") ConnectionFactory cf, JtaTransactionManager tm) {
+    JmsComponent amq(ConnectionFactory cf, JtaTransactionManager tm) {
         JmsComponent amq = new JmsComponent();
         amq.setConnectionFactory(cf);
         amq.setTransactionManager(tm);

diff --git a/message-bridge/src/main/resources/application.properties b/message-bridge/src/main/resources/application.properties
@@ -26,11 +26,12 @@ ibm.mq.user=app
 ibm.mq.password=passw0rd
 ibm.mq.queue=DEV.QUEUE.1
 
-quarkus.artemis.amqConnectionFactory.url=tcp://localhost:61616
-%kubernetes.quarkus.artemis.amqConnectionFactory.url=tcp://${ACTIVEMQ_SERVICE_HOST}:61616
-%openshift.quarkus.artemis.amqConnectionFactory.url=tcp://activemq-artemis-broker:61616
-quarkus.artemis.amqConnectionFactory.username=admin
-quarkus.artemis.amqConnectionFactory.password=admin
+quarkus.artemis.devservices.enabled=true
+%prod.quarkus.artemis.url=tcp://localhost:61616
+%prod.quarkus.artemis.username=admin
+%prod.quarkus.artemis.password=admin
+%kubernetes.quarkus.artemis.url=tcp://${ACTIVEMQ_SERVICE_HOST}:61616
+%openshift.quarkus.artemis.url=tcp://activemq-artemis-broker:61616
 amq.queue=in
 
 quarkus.pooled-jms.transaction=xa

diff --git a/message-bridge/src/test/java/org/acme/message/bridge/MessageBridgeITCase.java b/message-bridge/src/test/java/org/acme/message/bridge/MessageBridgeITCase.java
@@ -21,7 +21,6 @@
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.artemis.test.ArtemisTestResource;
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.restassured.RestAssured;
@@ -37,7 +36,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusIntegrationTest
-@WithTestResource(ArtemisTestResource.class)
 @WithTestResource(IBMMQTestResource.class)
 // The crash test will kill the app, so it must be executed last as there is no way to restart the application
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)

diff --git a/message-bridge/src/test/resources/broker.xml b/message-bridge/src/test/resources/broker.xml