Skip to content

Commit 1c7763d

Browse files
committed
Update deprecated @QuarkusTestResource to @WithTestResource
1 parent 52916b8 commit 1c7763d

File tree

20 files changed

+42
-42
lines changed

20 files changed

+42
-42
lines changed

002-quarkus-all-extensions/src/test/java/io/quarkus/qe/core/AlmostAllQuarkusExtensionsTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
import io.quarkus.qe.core.containers.MongoTestResource;
99
import io.quarkus.qe.core.containers.PostgreSqlDatabaseTestResource;
10-
import io.quarkus.test.common.QuarkusTestResource;
10+
import io.quarkus.test.common.WithTestResource;
1111
import io.quarkus.test.junit.QuarkusTest;
1212

1313
@QuarkusTest
14-
@QuarkusTestResource(value = MongoTestResource.class)
15-
@QuarkusTestResource(value = PostgreSqlDatabaseTestResource.class)
14+
@WithTestResource(value = MongoTestResource.class)
15+
@WithTestResource(value = PostgreSqlDatabaseTestResource.class)
1616
public class AlmostAllQuarkusExtensionsTest {
1717

1818
@Test

004-quarkus-HHH-and-HV/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Quarkus - Hibernate and Hibernate Validator (lazy fetch strategy)
22
This scenario uses in-memory Java database H2.
3-
Test class annotated with `@QuarkusTestResource(H2DatabaseTestResource.class)` starts an in-memory H2 database
3+
Test class annotated with `@WithTestResource(H2DatabaseTestResource.class)` starts an in-memory H2 database
44

55
Module that covers integration with some Hibernate features like:
66
- Reproducer for [14201](https://github.com/quarkusio/quarkus/issues/14201) and [14881](https://github.com/quarkusio/quarkus/issues/14881): possible data loss bug in hibernate. This is covered under the Java package `io.quarkus.qe.hibernate.items`.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.quarkus.qe.hibernate.validator;
22

3-
import io.quarkus.test.common.QuarkusTestResource;
3+
import io.quarkus.test.common.WithTestResource;
44
import io.quarkus.test.h2.H2DatabaseTestResource;
55

6-
@QuarkusTestResource(H2DatabaseTestResource.class)
6+
@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
77
public class TestResources {
88
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.quarkus.qe.quartz;
22

3-
import io.quarkus.test.common.QuarkusTestResource;
3+
import io.quarkus.test.common.WithTestResource;
44
import io.quarkus.test.h2.H2DatabaseTestResource;
55

6-
@QuarkusTestResource(H2DatabaseTestResource.class)
6+
@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
77
public class TestResources {
88
}

011-quarkus-panache-rest-flyway/src/test/java/io/quarkus/qe/PostgreSqlApplicationResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
import org.junit.jupiter.api.Test;
1818

1919
import io.quarkus.qe.containers.PostgreSqlDatabaseTestResource;
20-
import io.quarkus.test.common.QuarkusTestResource;
20+
import io.quarkus.test.common.WithTestResource;
2121
import io.quarkus.test.junit.QuarkusTest;
2222
import io.restassured.http.ContentType;
2323
import io.restassured.specification.RequestSpecification;
2424

2525
import jakarta.ws.rs.core.MediaType;
2626

2727
@QuarkusTest
28-
@QuarkusTestResource(PostgreSqlDatabaseTestResource.class)
28+
@WithTestResource(PostgreSqlDatabaseTestResource.class)
2929
public class PostgreSqlApplicationResourceTest {
3030

3131
private static final String APPLICATION_PATH = "/application";

013-quarkus-oidc-restclient/src/test/java/io/quarkus/qe/AbstractPingPongResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
import io.quarkus.qe.containers.KeycloakTestResource;
1616
import io.quarkus.qe.model.Score;
17-
import io.quarkus.test.common.QuarkusTestResource;
17+
import io.quarkus.test.common.WithTestResource;
1818
import io.restassured.RestAssured;
1919
import io.restassured.config.RestAssuredConfig;
2020
import io.restassured.http.ContentType;
2121

22-
@QuarkusTestResource(KeycloakTestResource.class)
22+
@WithTestResource(value = KeycloakTestResource.class, restrictToAnnotatedClass = false)
2323
public abstract class AbstractPingPongResourceTest {
2424

2525
private static final String PING_ENDPOINT = "/%s-ping";

014-quarkus-panache-with-transactions-xa/src/test/java/io/quarkus/qe/MySqlApplicationResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
import org.junit.jupiter.api.Test;
1414

1515
import io.quarkus.qe.containers.MySqlDatabaseTestResource;
16-
import io.quarkus.test.common.QuarkusTestResource;
16+
import io.quarkus.test.common.WithTestResource;
1717
import io.quarkus.test.junit.QuarkusTest;
1818
import io.restassured.http.ContentType;
1919
import io.restassured.specification.RequestSpecification;
2020

2121
import jakarta.ws.rs.core.MediaType;
2222

2323
@QuarkusTest
24-
@QuarkusTestResource(MySqlDatabaseTestResource.class)
24+
@WithTestResource(MySqlDatabaseTestResource.class)
2525
public class MySqlApplicationResourceTest {
2626

2727
private static final String APPLICATION_PATH = "/application";

014-quarkus-panache-with-transactions-xa/src/test/java/io/quarkus/qe/rest/data/UserResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import org.junit.jupiter.api.Test;
1111

1212
import io.quarkus.qe.containers.MySqlDatabaseTestResource;
13-
import io.quarkus.test.common.QuarkusTestResource;
13+
import io.quarkus.test.common.WithTestResource;
1414
import io.quarkus.test.junit.QuarkusTest;
1515

1616
@QuarkusTest
17-
@QuarkusTestResource(MySqlDatabaseTestResource.class)
17+
@WithTestResource(MySqlDatabaseTestResource.class)
1818
class UserResourceTest {
1919

2020
private final static String NEW_USER_ID = "3";

017-quartz-cluster/src/test/java/io/quarkus/qe/quartz/AnnotationScheduledJobsQuartzTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import io.quarkus.qe.quartz.resources.QuartzNodeApplicationResource;
1818
import io.quarkus.qe.quartz.resources.RestApplicationResource;
1919
import io.quarkus.test.QuarkusProdModeTest;
20-
import io.quarkus.test.common.QuarkusTestResource;
20+
import io.quarkus.test.common.WithTestResource;
2121
import io.quarkus.test.h2.H2DatabaseTestResource;
2222
import io.restassured.RestAssured;
2323

24-
@QuarkusTestResource(H2DatabaseTestResource.class)
24+
@WithTestResource(H2DatabaseTestResource.class)
2525
public class AnnotationScheduledJobsQuartzTest {
2626

2727
private static final int REST_PORT = 8081;

019-quarkus-consul/src/test/java/io/quarkus/qe/GreetingResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
import io.quarkus.qe.containers.ConsulTestResource;
2323
import io.quarkus.test.QuarkusProdModeTest;
24-
import io.quarkus.test.common.QuarkusTestResource;
24+
import io.quarkus.test.common.WithTestResource;
2525

26-
@QuarkusTestResource(ConsulTestResource.class)
26+
@WithTestResource(ConsulTestResource.class)
2727
public class GreetingResourceTest {
2828

2929
private static final String APPLICATION_PROPERTIES = "application.properties";

021-quarkus-panache-multiple-pus/src/test/java/io/quarkus/qe/multiplepus/MultiplePersistenceUnitTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
import io.quarkus.qe.multiplepus.containers.PostgreSqlDatabaseTestResource;
1414
import io.quarkus.qe.multiplepus.model.fruit.Fruit;
1515
import io.quarkus.qe.multiplepus.model.vegetable.Vegetable;
16-
import io.quarkus.test.common.QuarkusTestResource;
16+
import io.quarkus.test.common.WithTestResource;
1717
import io.quarkus.test.junit.QuarkusTest;
1818
import io.restassured.http.ContentType;
1919

2020
@QuarkusTest
21-
@QuarkusTestResource(MariaDbDatabaseTestResource.class)
22-
@QuarkusTestResource(PostgreSqlDatabaseTestResource.class)
21+
@WithTestResource(MariaDbDatabaseTestResource.class)
22+
@WithTestResource(PostgreSqlDatabaseTestResource.class)
2323
class MultiplePersistenceUnitTest {
2424

2525
private static boolean shouldCleanupFruit = false;

300-quarkus-vertx-webClient/src/test/java/io/quarkus/qe/vertx/webclient/ChuckNorrisResourceTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626

2727
import io.quarkus.qe.vertx.webclient.resources.JaegerTestResource;
2828
import io.quarkus.qe.vertx.webclient.resources.WireMockChuckNorrisResource;
29-
import io.quarkus.test.common.QuarkusTestResource;
29+
import io.quarkus.test.common.WithTestResource;
3030
import io.quarkus.test.junit.QuarkusTest;
3131
import io.restassured.response.Response;
3232

3333
@QuarkusTest
34-
@QuarkusTestResource(WireMockChuckNorrisResource.class)
35-
@QuarkusTestResource(JaegerTestResource.class)
34+
@WithTestResource(WireMockChuckNorrisResource.class)
35+
@WithTestResource(JaegerTestResource.class)
3636
public class ChuckNorrisResourceTest {
3737
private final static String jaegerEndpoint = "http://localhost:16686/api/traces";
3838
static final String EXPECTED_ID = "aBanNLDwR-SAz7iMHuCiyw";

301-quarkus-vertx-kafka/src/test/java/io/quarkus/qe/kafka/ConfluentKafkaTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import io.quarkus.qe.kafka.resources.ConfluentTestProfile;
44
import io.quarkus.qe.kafka.resources.JaegerTestResource;
5-
import io.quarkus.test.common.QuarkusTestResource;
5+
import io.quarkus.test.common.WithTestResource;
66
import io.quarkus.test.junit.QuarkusTest;
77
import io.quarkus.test.junit.TestProfile;
88

99
@QuarkusTest
1010
@TestProfile(ConfluentTestProfile.class)
11-
@QuarkusTestResource(JaegerTestResource.class)
11+
@WithTestResource(JaegerTestResource.class)
1212
public class ConfluentKafkaTest extends KafkaCommonTest {
1313
private static final String STOCK_MONITOR_SSE_ENDPOINT = "http://localhost:8081/stock/stream";
1414

301-quarkus-vertx-kafka/src/test/java/io/quarkus/qe/kafka/StrimziKafkaTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import io.quarkus.qe.kafka.resources.JaegerTestResource;
44
import io.quarkus.qe.kafka.resources.StrimziTestProfile;
5-
import io.quarkus.test.common.QuarkusTestResource;
5+
import io.quarkus.test.common.WithTestResource;
66
import io.quarkus.test.junit.QuarkusTest;
77
import io.quarkus.test.junit.TestProfile;
88

99
@QuarkusTest
1010
@TestProfile(StrimziTestProfile.class)
11-
@QuarkusTestResource(JaegerTestResource.class)
11+
@WithTestResource(JaegerTestResource.class)
1212
public class StrimziKafkaTest extends KafkaCommonTest {
1313

1414
private static final String STOCK_MONITOR_SSE_ENDPOINT = "http://localhost:8081/stock/stream";

302-quarkus-vertx-jwt/src/test/java/io/quarkus/qe/vertx/web/BladeRunnerHandlerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import org.junit.jupiter.api.Test;
88

99
import io.quarkus.qe.vertx.resources.RedisResource;
10-
import io.quarkus.test.common.QuarkusTestResource;
10+
import io.quarkus.test.common.WithTestResource;
1111
import io.quarkus.test.junit.QuarkusTest;
1212
import io.restassured.http.ContentType;
1313

1414
@QuarkusTest
15-
@QuarkusTestResource(RedisResource.class)
15+
@WithTestResource(RedisResource.class)
1616
public class BladeRunnerHandlerTest extends AbstractCommonTest {
1717
@Test
1818
@DisplayName("Retrieve bladeRunner by id")

302-quarkus-vertx-jwt/src/test/java/io/quarkus/qe/vertx/web/NoSecuredResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import org.junit.jupiter.api.Test;
77

88
import io.quarkus.qe.vertx.resources.RedisResource;
9-
import io.quarkus.test.common.QuarkusTestResource;
9+
import io.quarkus.test.common.WithTestResource;
1010
import io.quarkus.test.junit.QuarkusTest;
1111

1212
@QuarkusTest
13-
@QuarkusTestResource(RedisResource.class)
13+
@WithTestResource(RedisResource.class)
1414
public class NoSecuredResourceTest {
1515
@Test
1616
@DisplayName("no-secured resource. ")

302-quarkus-vertx-jwt/src/test/java/io/quarkus/qe/vertx/web/ReplicantHandlerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import org.junit.jupiter.api.Test;
88

99
import io.quarkus.qe.vertx.resources.RedisResource;
10-
import io.quarkus.test.common.QuarkusTestResource;
10+
import io.quarkus.test.common.WithTestResource;
1111
import io.quarkus.test.junit.QuarkusTest;
1212
import io.restassured.http.ContentType;
1313

1414
@QuarkusTest
15-
@QuarkusTestResource(RedisResource.class)
15+
@WithTestResource(RedisResource.class)
1616
public class ReplicantHandlerTest extends AbstractCommonTest {
1717
@Test
1818
@DisplayName("Retrieve replicant by id")

302-quarkus-vertx-jwt/src/test/java/io/quarkus/qe/vertx/web/SecuredResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import org.junit.jupiter.api.Test;
77

88
import io.quarkus.qe.vertx.resources.RedisResource;
9-
import io.quarkus.test.common.QuarkusTestResource;
9+
import io.quarkus.test.common.WithTestResource;
1010
import io.quarkus.test.junit.QuarkusTest;
1111
import io.restassured.http.ContentType;
1212

1313
@QuarkusTest
14-
@QuarkusTestResource(RedisResource.class)
14+
@WithTestResource(RedisResource.class)
1515
public class SecuredResourceTest extends AbstractCommonTest {
1616

1717
@Test
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.quarkus.qe.spring.data;
22

3-
import io.quarkus.test.common.QuarkusTestResource;
3+
import io.quarkus.test.common.WithTestResource;
44
import io.quarkus.test.h2.H2DatabaseTestResource;
55

6-
@QuarkusTestResource(H2DatabaseTestResource.class)
6+
@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
77
public class TestResources {
88
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.quarkus.qe.books;
22

3-
import io.quarkus.test.common.QuarkusTestResource;
3+
import io.quarkus.test.common.WithTestResource;
44
import io.quarkus.test.h2.H2DatabaseTestResource;
55

6-
@QuarkusTestResource(H2DatabaseTestResource.class)
6+
@WithTestResource(H2DatabaseTestResource.class)
77
public class TestResources {
88
}

0 commit comments

Comments
 (0)