Revert back to QuarkusTestResource

jamesnetherton · Sep 2, 2024 · 4d1c357 · 4d1c357
1 parent 1c19e80
commit 4d1c357
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/artemis-elasticsearch/src/test/java/org/acme/ElasticSearchTest.java b/artemis-elasticsearch/src/test/java/org/acme/ElasticSearchTest.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.time.Duration;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.acme.resource.CustomPahoTestResource;
 import org.acme.resource.ElasticSearchTestResource;
@@ -31,8 +31,8 @@
 import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
-@WithTestResource(CustomPahoTestResource.class)
-@WithTestResource(ElasticSearchTestResource.class)
+@QuarkusTestResource(CustomPahoTestResource.class)
+@QuarkusTestResource(ElasticSearchTestResource.class)
 class ElasticSearchTest {
 
     @Test

diff --git a/file-bindy-ftp/src/test/java/org/acme/bindy/ftp/FileToFtpTest.java b/file-bindy-ftp/src/test/java/org/acme/bindy/ftp/FileToFtpTest.java
@@ -23,7 +23,7 @@
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -32,7 +32,7 @@
 import static org.awaitility.Awaitility.await;
 
 @QuarkusTest
-@WithTestResource(FtpTestResource.class)
+@QuarkusTestResource(FtpTestResource.class)
 public class FileToFtpTest {
 
     @Test

diff --git a/jdbc-datasource/src/test/java/org/acme/jdbc/JdbcTest.java b/jdbc-datasource/src/test/java/org/acme/jdbc/JdbcTest.java
@@ -18,16 +18,16 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
 
 import static org.awaitility.Awaitility.await;
 
 @QuarkusTest
-@WithTestResource(PostgresSourceDatabaseTestResource.class)
-@WithTestResource(PostgresTargetDatabaseTestResource.class)
+@QuarkusTestResource(PostgresSourceDatabaseTestResource.class)
+@QuarkusTestResource(PostgresTargetDatabaseTestResource.class)
 public class JdbcTest {
 
     @Test

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,7 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.awaitility.Awaitility;
@@ -29,7 +29,7 @@
 import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
-@WithTestResource(H2DatabaseTestResource.class)
+@QuarkusTestResource(H2DatabaseTestResource.class)
 public class JtaTest {
     @Test
     public void testXA() {

diff --git a/...ository/src/test/java/org/acme/jpa/idempotent/repository/JpaIdempotentRepositoryTest.java b/...ository/src/test/java/org/acme/jpa/idempotent/repository/JpaIdempotentRepositoryTest.java
@@ -18,15 +18,15 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
 
 import static org.awaitility.Awaitility.await;
 
 @QuarkusTest
-@WithTestResource(JpaIdempotentRepositoryTestResource.class)
+@QuarkusTestResource(JpaIdempotentRepositoryTestResource.class)
 public class JpaIdempotentRepositoryTest {
     @Test
     public void contentSetShouldStartWithOneThreeFive() {

diff --git a/jta-jpa/src/test/java/org/acme/JtaTest.java b/jta-jpa/src/test/java/org/acme/JtaTest.java
@@ -18,7 +18,7 @@
 
 import java.util.UUID;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
@@ -27,7 +27,7 @@
 import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
-@WithTestResource(H2DatabaseTestResource.class)
+@QuarkusTestResource(H2DatabaseTestResource.class)
 public class JtaTest {
     @Test
     public void testXA() {

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,7 @@
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.restassured.RestAssured;
 import org.acme.message.bridge.resource.IBMMQTestResource;
@@ -36,7 +36,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusIntegrationTest
-@WithTestResource(IBMMQTestResource.class)
+@QuarkusTestResource(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)
 public class MessageBridgeITCase {