Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace quarkus-test-artemis with dev services container #258

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions jms-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -316,5 +311,16 @@
<quarkus.native.enabled>true</quarkus.native.enabled>
</properties>
</profile>
<profile>
<id>skip-testcontainers-tests</id>
<activation>
<property>
<name>skip-testcontainers-tests</name>
</property>
</activation>
<properties>
<skipTests>true</skipTests>
</properties>
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion jms-jpa/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions jms-jpa/src/test/java/org/acme/JtaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,7 +30,6 @@

@QuarkusTest
@WithTestResource(H2DatabaseTestResource.class)
@WithTestResource(ArtemisTestResource.class)
public class JtaTest {
@Test
public void testXA() {
Expand Down
44 changes: 0 additions & 44 deletions jms-jpa/src/test/resources/broker.xml

This file was deleted.

6 changes: 0 additions & 6 deletions message-bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 6 additions & 5 deletions message-bridge/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
41 changes: 0 additions & 41 deletions message-bridge/src/test/resources/broker.xml

This file was deleted.

Loading