Update deprecated @QuarkusTestResource to @WithTestResource

quarkusio · Jul 25, 2024 · 6b787e1 · 6b787e1
1 parent af6c820
commit 6b787e1
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 35 deletions.
diff --git a/context-propagation-quickstart/src/test/java/org/acme/context/prices/PriceIT.java b/context-propagation-quickstart/src/test/java/org/acme/context/prices/PriceIT.java
@@ -1,10 +1,10 @@
 package org.acme.context.prices;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
-@QuarkusTestResource(KafkaResource.class)
+@WithTestResource(KafkaResource.class)
 public class PriceIT extends PriceTest {
 
 }
diff --git a/context-propagation-quickstart/src/test/java/org/acme/context/prices/PriceTest.java b/context-propagation-quickstart/src/test/java/org/acme/context/prices/PriceTest.java
@@ -15,13 +15,13 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.common.mapper.TypeRef;
 
 @QuarkusTest
-@QuarkusTestResource(KafkaResource.class)
+@WithTestResource(KafkaResource.class)
 public class PriceTest {
 
     private static final String PRICES_SSE_ENDPOINT = "http://localhost:8081/prices";

diff --git a/jms-quickstart/src/test/java/org/acme/jms/PriceTest.java b/jms-quickstart/src/test/java/org/acme/jms/PriceTest.java
@@ -5,14 +5,14 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 
 import java.time.Duration;
 
 @QuarkusTest
-@QuarkusTestResource(ArtemisTestResource.class)
+@WithTestResource(ArtemisTestResource.class)
 public class PriceTest {
 
     @Test

diff --git a/kafka-panache-quickstart/src/test/java/org/acme/panache/PriceResourceTest.java b/kafka-panache-quickstart/src/test/java/org/acme/panache/PriceResourceTest.java
@@ -1,6 +1,5 @@
 package org.acme.panache;
 
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
 

diff --git a/kafka-panache-reactive-quickstart/src/test/java/org/acme/panache/PriceResourceTest.java b/kafka-panache-reactive-quickstart/src/test/java/org/acme/panache/PriceResourceTest.java
@@ -1,6 +1,5 @@
 package org.acme.panache;
 
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;
 

diff --git a/...tart/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/AggregatorIT.java b/...tart/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/AggregatorIT.java
@@ -4,7 +4,7 @@
 
 /**
  * Native tests execute with prod profile, not test. cf https://github.com/quarkusio/quarkus/issues/4371
- * Since we extend the Hotspot tests and share the QuarkusTestResource,
+ * Since we extend the Hotspot tests and share the WithTestResource,
  * this means broker test port MUST be the same as production port.
  */
 @QuarkusIntegrationTest

diff --git a/...rt/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/AggregatorTest.java b/...rt/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/AggregatorTest.java
@@ -33,14 +33,14 @@
 
 import io.quarkus.kafka.client.serialization.ObjectMapperDeserializer;
 import io.quarkus.kafka.client.serialization.ObjectMapperSerializer;
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 /**
  * Integration testing of the application with an embedded broker.
  */
 @QuarkusTest
-@QuarkusTestResource(KafkaResource.class)
+@WithTestResource(KafkaResource.class)
 public class AggregatorTest {
 
     KafkaProducer<Integer, String> temperatureProducer;

diff --git a/mongodb-panache-quickstart/src/test/java/org/acme/mongodb/panache/PersonResourceTest.java b/mongodb-panache-quickstart/src/test/java/org/acme/mongodb/panache/PersonResourceTest.java
@@ -15,15 +15,15 @@
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.config.ObjectMapperConfig;
 import io.restassured.http.ContentType;
 import io.restassured.parsing.Parser;
 
 @QuarkusTest
-@QuarkusTestResource(MongoDbResource.class)
+@WithTestResource(MongoDbResource.class)
 class PersonResourceTest {
 
     @BeforeAll

diff --git a/mongodb-quickstart/src/test/java/org/acme/mongodb/FruitResourceTest.java b/mongodb-quickstart/src/test/java/org/acme/mongodb/FruitResourceTest.java
@@ -1,6 +1,6 @@
 package org.acme.mongodb;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import org.apache.http.HttpStatus;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -12,7 +12,7 @@
 import io.restassured.http.ContentType;
 
 @QuarkusTest
-@QuarkusTestResource(MongoDbResource.class)
+@WithTestResource(MongoDbResource.class)
 public class FruitResourceTest {
 
     @ParameterizedTest

diff --git a/neo4j-quickstart/src/test/java/org/acme/neo4j/FruitsEndpointTest.java b/neo4j-quickstart/src/test/java/org/acme/neo4j/FruitsEndpointTest.java
@@ -14,11 +14,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@QuarkusTestResource(Neo4jResource.class)
+@WithTestResource(Neo4jResource.class)
 class FruitsEndpointTest {
 
     private static final Map<String, String> fruitIdMap = new HashMap<>();

diff --git a/optaplanner-quickstart/src/test/java/org/acme/optaplanner/TestResources.java b/optaplanner-quickstart/src/test/java/org/acme/optaplanner/TestResources.java
@@ -1,9 +1,9 @@
 package org.acme.optaplanner;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 
-@QuarkusTestResource(H2DatabaseTestResource.class)
+@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
 public class TestResources {
 
 }
diff --git a/rest-client-quickstart/src/test/java/org/acme/rest/client/ExtensionsResourceTest.java b/rest-client-quickstart/src/test/java/org/acme/rest/client/ExtensionsResourceTest.java
@@ -1,6 +1,6 @@
 package org.acme.rest.client;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 import org.acme.rest.client.resources.WireMockExtensions;
@@ -12,7 +12,7 @@
 import static org.hamcrest.Matchers.greaterThan;
 
 @QuarkusTest
-@QuarkusTestResource(WireMockExtensions.class)
+@WithTestResource(WireMockExtensions.class)
 public class ExtensionsResourceTest {
 
     @Test

diff --git a/resteasy-client-quickstart/src/test/java/org/acme/rest/client/ExtensionsResourceTest.java b/resteasy-client-quickstart/src/test/java/org/acme/rest/client/ExtensionsResourceTest.java
@@ -8,11 +8,11 @@
 import org.acme.rest.client.resources.WireMockExtensions;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-@QuarkusTestResource(WireMockExtensions.class)
+@WithTestResource(WireMockExtensions.class)
 public class ExtensionsResourceTest {
 
     @Test

diff --git a/security-ldap-quickstart/pom.xml b/security-ldap-quickstart/pom.xml
@@ -12,7 +12,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
+    <quarkus.platform.version>3.2.9.Final</quarkus.platform.version>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
   </properties>
   <dependencyManagement>
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest</artifactId>
+      <artifactId>quarkus-resteasy-reactive</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/security-ldap-quickstart/src/main/resources/quarkus-io.ldif b/security-ldap-quickstart/src/main/resources/quarkus-io.ldif
@@ -0,0 +1,81 @@
+version: 1
+
+dn: dc=quarkus,dc=io
+dc: quarkus
+objectClass: top
+objectClass: domain
+
+#The user OU
+
+dn: ou=Users,dc=quarkus,dc=io
+objectClass: organizationalUnit
+objectClass: top
+ou: Users
+
+#The users
+
+dn: uid=noRoleUser,ou=Users,dc=quarkus,dc=io
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+cn: No Role User
+sn: noRoleUser
+uid: noRoleUser
+userPassword: noRoleUserPassword
+
+dn: uid=standardUser,ou=Users,dc=quarkus,dc=io
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+cn: StandardUser
+sn: standardUser
+uid: standardUser
+userPassword: standardUserPassword
+
+dn: uid=adminUser,ou=Users,dc=quarkus,dc=io
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+cn: AdministratorUser
+sn: adminUser
+uid: adminUser
+userPassword: adminUserPassword
+
+# A sub OU of Users
+
+dn: ou=SubUsers,ou=Users,dc=quarkus,dc=io
+objectclass: organizationalUnit
+objectclass: top
+ou: SubUsers
+
+dn: uid=subUser,ou=SubUsers,ou=Users,dc=quarkus,dc=io
+objectclass: top
+objectclass: person
+objectclass: inetOrgPerson
+cn: SubUser
+sn: subUser
+uid: subUser
+userpassword: subUserPassword
+
+
+#The roles OU
+
+dn: ou=Roles,dc=quarkus,dc=io
+objectclass: top
+objectclass: organizationalUnit
+ou: Roles
+
+#The roles
+
+dn: cn=standardRole,ou=Roles,dc=quarkus,dc=io
+objectClass: top
+objectClass: groupOfNames
+cn: standardRole
+member: uid=standardUser,ou=Users,dc=quarkus,dc=io
+member: uid=subUser,ou=SubUsers,ou=Users,dc=quarkus,dc=io
+
+dn: cn=adminRole,ou=Roles,dc=quarkus,dc=io
+objectClass: top
+objectClass: groupOfNames
+cn: adminRole
+member: uid=adminUser,ou=Users,dc=quarkus,dc=io
diff --git a/security-ldap-quickstart/src/test/resources/quarkus-io.ldif b/security-ldap-quickstart/src/test/resources/quarkus-io.ldif
@@ -0,0 +1,81 @@
+version: 1
+
+dn: dc=quarkus,dc=io
+dc: quarkus
+objectClass: top
+objectClass: domain
+
+#The user OU
+
+dn: ou=Users,dc=quarkus,dc=io
+objectClass: organizationalUnit
+objectClass: top
+ou: Users
+
+#The users
+
+dn: uid=noRoleUser,ou=Users,dc=quarkus,dc=io
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+cn: No Role User
+sn: noRoleUser
+uid: noRoleUser
+userPassword: noRoleUserPassword
+
+dn: uid=standardUser,ou=Users,dc=quarkus,dc=io
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+cn: StandardUser
+sn: standardUser
+uid: standardUser
+userPassword: standardUserPassword
+
+dn: uid=adminUser,ou=Users,dc=quarkus,dc=io
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+cn: AdministratorUser
+sn: adminUser
+uid: adminUser
+userPassword: adminUserPassword
+
+# A sub OU of Users
+
+dn: ou=SubUsers,ou=Users,dc=quarkus,dc=io
+objectclass: organizationalUnit
+objectclass: top
+ou: SubUsers
+
+dn: uid=subUser,ou=SubUsers,ou=Users,dc=quarkus,dc=io
+objectclass: top
+objectclass: person
+objectclass: inetOrgPerson
+cn: SubUser
+sn: subUser
+uid: subUser
+userpassword: subUserPassword
+
+
+#The roles OU
+
+dn: ou=Roles,dc=quarkus,dc=io
+objectclass: top
+objectclass: organizationalUnit
+ou: Roles
+
+#The roles
+
+dn: cn=standardRole,ou=Roles,dc=quarkus,dc=io
+objectClass: top
+objectClass: groupOfNames
+cn: standardRole
+member: uid=standardUser,ou=Users,dc=quarkus,dc=io
+member: uid=subUser,ou=SubUsers,ou=Users,dc=quarkus,dc=io
+
+dn: cn=adminRole,ou=Roles,dc=quarkus,dc=io
+objectClass: top
+objectClass: groupOfNames
+cn: adminRole
+member: uid=adminUser,ou=Users,dc=quarkus,dc=io
diff --git a/...ty-oauth2-quickstart/src/test/java/org/acme/security/oauth2/TokenSecuredResourceTest.java b/...ty-oauth2-quickstart/src/test/java/org/acme/security/oauth2/TokenSecuredResourceTest.java
@@ -1,14 +1,14 @@
 package org.acme.security.oauth2;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.containsString;
 
 @QuarkusTest
-@QuarkusTestResource(MockAuthorizationServerTestResource.class)
+@WithTestResource(MockAuthorizationServerTestResource.class)
 class TokenSecuredResourceTest {
     // use whatever token you want as the mock OAuth server will accept all tokens
     private static final String BEARER_TOKEN = "337aab0f-b547-489b-9dbd-a54dc7bdf20d";

diff --git a/stork-dns-quickstart/src/test/java/org/acme/FrontendApiIT.java b/stork-dns-quickstart/src/test/java/org/acme/FrontendApiIT.java
@@ -1,10 +1,10 @@
 package org.acme;
 
-import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
-@QuarkusTestResource(DnsTestResource.class)
+@WithTestResource(DnsTestResource.class)
 public class FrontendApiIT extends FrontendApiTest {
 
 }