Revert back to QuarkusTestResource (#6394)

apache · Aug 28, 2024 · 8f2205b · 8f2205b
1 parent 5e17941
commit 8f2205b
Show file tree

Hide file tree

Showing 168 changed files with 343 additions and 343 deletions.
diff --git a/docs/modules/ROOT/pages/user-guide/testing.adoc b/docs/modules/ROOT/pages/user-guide/testing.adoc
@@ -131,15 +131,15 @@ public class MyTestResource implements QuarkusTestResourceLifecycleManager {
 }
 ----
 
-The defined test resource needs to be referenced from the test classes with `@WithTestResource` as shown below:
+The defined test resource needs to be referenced from the test classes with `@QuarkusTestResource` as shown below:
 
 [source,java]
 ----
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@WithTestResource(MyTestResource.class)
+@QuarkusTestResource(MyTestResource.class)
 class MyTest {
    ...
 }
@@ -206,16 +206,16 @@ public class WireMockTestResource implements QuarkusTestResourceLifecycleManager
 }
 ----
 
-Finally, ensure your test class has the `@WithTestResource` annotation with the appropriate test resource class specified as the value. The WireMock server will be started before all tests are
+Finally, ensure your test class has the `@QuarkusTestResource` annotation with the appropriate test resource class specified as the value. The WireMock server will be started before all tests are
 executed and will be shut down when all tests are finished.
 
 [source,java]
 ----
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@WithTestResource(WireMockTestResource.class)
+@QuarkusTestResource(WireMockTestResource.class)
 class MyTest {
    ...
 }

diff --git a/...rc/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java b/...rc/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.quarkus.component.aws2.ddb.it;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
@@ -25,7 +25,7 @@
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2DdbQuarkusClientTest {
 
     @Test

diff --git a/.../aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java b/.../aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 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 io.restassured.http.ContentType;
@@ -44,7 +44,7 @@
 import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2CwTest extends BaseAWs2TestSupport {
     private static final Logger LOG = Logger.getLogger(Aws2CwTest.class);
 

diff --git a/...2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java b/...2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -38,7 +38,7 @@
 import static org.apache.camel.quarkus.component.aws2.ddb.it.Aws2DdbResource.Table;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2DdbStreamTest {
 
     private static final Logger LOG = Logger.getLogger(Aws2DdbStreamTest.class);

diff --git a/...s2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java b/...s2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTest.java
@@ -22,7 +22,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -42,7 +42,7 @@
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2DdbTest extends BaseAWs2TestSupport {
 
     private static final Logger LOG = Logger.getLogger(Aws2DdbTest.class);

diff --git a/...test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java b/...test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
@@ -20,7 +20,7 @@
 import java.util.List;
 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 io.restassured.http.ContentType;
@@ -43,7 +43,7 @@
 import software.amazon.awssdk.services.s3.model.S3Object;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2KinesisFirehoseTest extends BaseAWs2TestSupport {
 
     private static final Logger LOG = Logger.getLogger(Aws2KinesisFirehoseTest.class);

diff --git a/...sis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java b/...sis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
@@ -18,7 +18,7 @@
 
 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 io.restassured.http.ContentType;
@@ -33,7 +33,7 @@
 
 @DisabledIfEnvironmentVariable(named = "CI", matches = "true", disabledReason = "https://github.com/apache/camel-quarkus/issues/6342")
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2KinesisTest extends BaseAWs2TestSupport {
 
     private static final Logger LOG = Logger.getLogger(Aws2KinesisTest.class);

diff --git a/...ambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java b/...ambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
@@ -24,7 +24,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -42,7 +42,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2LambdaTest extends BaseAWs2TestSupport {
     private static final Logger LOG = Logger.getLogger(Aws2LambdaTest.class);
 

diff --git a/.../aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java b/.../aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
@@ -23,7 +23,7 @@
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -40,7 +40,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2S3Test extends BaseAWs2TestSupport {
     private int objects_num_before;
     private int objects_num_after;

diff --git a/...s2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java b/...s2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
@@ -24,7 +24,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -57,7 +57,7 @@
 @EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY", matches = "[a-zA-Z0-9]+")
 @EnabledIfEnvironmentVariable(named = "MAILSLURP_API_KEY", matches = "[a-zA-Z0-9]+")
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2SesTest extends BaseAWs2TestSupport {
     private static final Logger LOG = Logger.getLogger(Aws2SesTest.class);
 

diff --git a/...-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTest.java b/...-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTest.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.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -35,7 +35,7 @@
 import static org.hamcrest.core.Is.is;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2SqsSnsTest extends BaseAWs2TestSupport {
 
     public Aws2SqsSnsTest() {

diff --git a/...s2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTest.java b/...s2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTest.java
@@ -27,7 +27,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -48,7 +48,7 @@
 import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
-@WithTestResource(Aws2TestResource.class)
+@QuarkusTestResource(Aws2TestResource.class)
 class Aws2SqsTest extends BaseAWs2TestSupport {
 
     private static final Logger LOG = Logger.getLogger(Aws2SqsTest.class);

diff --git a/...est/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobIT.java b/...est/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobIT.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.quarkus.component.azure.storage.blob.it;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.apache.camel.quarkus.test.support.azure.AzureStorageTestResource;
 
 @QuarkusIntegrationTest
-@WithTestResource(AzureStorageTestResource.class)
+@QuarkusTestResource(AzureStorageTestResource.class)
 class AzureStorageBlobIT extends AzureStorageBlobTest {
 
 }
diff --git a/...t/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java b/...t/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
@@ -28,7 +28,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.azure.storage.blob.models.BlockListType;
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -55,7 +55,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @QuarkusTest
-@WithTestResource(AzureStorageTestResource.class)
+@QuarkusTestResource(AzureStorageTestResource.class)
 class AzureStorageBlobTest {
 
     private static final String BLOB_CONTENT = "Hello Camel Quarkus Azure Blob";

diff --git a/...t/java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueIT.java b/...t/java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueIT.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.quarkus.component.azure.storage.queue.it;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.apache.camel.quarkus.test.support.azure.AzureStorageTestResource;
 
 @QuarkusIntegrationTest
-@WithTestResource(AzureStorageTestResource.class)
+@QuarkusTestResource(AzureStorageTestResource.class)
 class AzureStorageQueueIT extends AzureStorageQueueTest {
 
 }
diff --git a/...java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueTest.java b/...java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueTest.java
@@ -20,7 +20,7 @@
 import java.util.List;
 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 io.restassured.http.ContentType;
@@ -35,7 +35,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @QuarkusTest
-@WithTestResource(AzureStorageTestResource.class)
+@QuarkusTestResource(AzureStorageTestResource.class)
 class AzureStorageQueueTest {
 
     @Test

diff --git a/...rc/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java b/...rc/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
@@ -22,7 +22,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -38,7 +38,7 @@
 import static org.hamcrest.Matchers.equalTo;
 
 @QuarkusTest
-@WithTestResource(value = CxfClientTestResource.class, restrictToAnnotatedClass = false)
+@QuarkusTestResource(value = CxfClientTestResource.class)
 class CxfSoapClientTest {
 
     @ParameterizedTest

diff --git a/...st/src/test/java/org/apache/camel/quarkus/component/cxf/soap/rest/it/CxfSoapRestTest.java b/...st/src/test/java/org/apache/camel/quarkus/component/cxf/soap/rest/it/CxfSoapRestTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.quarkus.component.cxf.soap.rest.it;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
-@WithTestResource(value = CxfRestTestResource.class, restrictToAnnotatedClass = false)
+@QuarkusTestResource(value = CxfRestTestResource.class)
 class CxfSoapRestTest {
 
     @Test

diff --git a/.../java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java b/.../java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
@@ -26,7 +26,7 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.DisabledOnIntegrationTest;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -45,7 +45,7 @@
 import static org.hamcrest.Matchers.equalTo;
 
 @QuarkusTest
-@WithTestResource(value = CxfWssClientTestResource.class, restrictToAnnotatedClass = false)
+@QuarkusTestResource(value = CxfWssClientTestResource.class, restrictToAnnotatedClass = false)
 class CxfSoapWssClientTest {
 
     @Test

diff --git a/.../java/org/apache/camel/quarkus/component/cxf/soap/wss/server/it/CxfSoapWssServerTest.java b/.../java/org/apache/camel/quarkus/component/cxf/soap/wss/server/it/CxfSoapWssServerTest.java
@@ -25,7 +25,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil;
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.apache.cxf.endpoint.Client;
@@ -42,7 +42,7 @@
 import static io.quarkiverse.cxf.test.QuarkusCxfClientTestUtil.anyNs;
 
 @QuarkusTest
-@WithTestResource(value = CxfWssServerTestResource.class, restrictToAnnotatedClass = false)
+@QuarkusTestResource(value = CxfWssServerTestResource.class)
 class CxfSoapWssServerTest {
 
     @Test

diff --git a/...n/language/src/test/java/org/apache/camel/quarkus/component/language/it/LanguageTest.java b/...n/language/src/test/java/org/apache/camel/quarkus/component/language/it/LanguageTest.java
@@ -25,7 +25,7 @@
 import java.util.stream.Collectors;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
@@ -46,7 +46,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @QuarkusTest
-@WithTestResource(LanguageTestResource.class)
+@QuarkusTestResource(LanguageTestResource.class)
 class LanguageTest {
 
     @MockServer