Remove duplicate testing code

quarkusio · Mar 21, 2023 · adebae9 · adebae9
1 parent 3980b35
commit adebae9
Show file tree

Hide file tree

Showing 17 changed files with 152 additions and 194 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1864,6 +1864,13 @@
                 <artifactId>quarkus-reactive-datasource-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-reactive-datasource-deployment</artifactId>
+                <version>${project.version}</version>
+                <scope>test</scope>
+                <type>test-jar</type>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-reactive-db2-client</artifactId>

diff --git a/extensions/reactive-datasource/deployment/pom.xml b/extensions/reactive-datasource/deployment/pom.xml
@@ -30,6 +30,11 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -46,6 +51,17 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/...loyment/src/test/java/io/quarkus/reactive/datasource/ChangingCredentialsProviderBase.java b/...loyment/src/test/java/io/quarkus/reactive/datasource/ChangingCredentialsProviderBase.java
@@ -0,0 +1,38 @@
+package io.quarkus.reactive.datasource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.credentials.CredentialsProvider;
+
+public abstract class ChangingCredentialsProviderBase implements CredentialsProvider {
+
+    private static final Logger log = Logger.getLogger(ChangingCredentialsProviderBase.class.getName());
+
+    private final String user2;
+    private final String password2;
+
+    private volatile Map<String, String> properties;
+
+    protected ChangingCredentialsProviderBase(String user1, String password1, String user2, String password2) {
+        properties = new HashMap<>();
+        properties.put(USER_PROPERTY_NAME, user1);
+        properties.put(PASSWORD_PROPERTY_NAME, password1);
+        this.user2 = user2;
+        this.password2 = password2;
+    }
+
+    public void changeProperties() {
+        properties = new HashMap<>();
+        properties.put(USER_PROPERTY_NAME, user2);
+        properties.put(PASSWORD_PROPERTY_NAME, password2);
+    }
+
+    @Override
+    public Map<String, String> getCredentials(String credentialsProviderName) {
+        log.info("credentials provider returning " + properties);
+        return properties;
+    }
+}
diff --git a/.../deployment/src/test/java/io/quarkus/reactive/datasource/ChangingCredentialsTestBase.java b/.../deployment/src/test/java/io/quarkus/reactive/datasource/ChangingCredentialsTestBase.java
@@ -0,0 +1,36 @@
+package io.quarkus.reactive.datasource;
+
+import static io.restassured.RestAssured.given;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Test;
+
+public abstract class ChangingCredentialsTestBase {
+
+    private String user1;
+    private String user2;
+
+    protected ChangingCredentialsTestBase(String user1, String user2) {
+        this.user1 = user1;
+        this.user2 = user2;
+    }
+
+    @Test
+    public void testConnect() throws Exception {
+        given()
+                .when().get("/test")
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.equalTo(user1));
+
+        SECONDS.sleep(2); // sleep longer than pool idle connection timeout
+
+        given()
+                .when().get("/test")
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.equalTo(user2));
+    }
+
+}
diff --git a/extensions/reactive-mssql-client/deployment/pom.xml b/extensions/reactive-mssql-client/deployment/pom.xml
@@ -69,6 +69,12 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-datasource-deployment</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...eployment/src/test/java/io/quarkus/reactive/mssql/client/ChangingCredentialsProvider.java b/...eployment/src/test/java/io/quarkus/reactive/mssql/client/ChangingCredentialsProvider.java
@@ -1,36 +1,13 @@
 package io.quarkus.reactive.mssql.client;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import jakarta.enterprise.context.ApplicationScoped;
 
-import org.jboss.logging.Logger;
-
-import io.quarkus.credentials.CredentialsProvider;
+import io.quarkus.reactive.datasource.ChangingCredentialsProviderBase;
 
 @ApplicationScoped
-public class ChangingCredentialsProvider implements CredentialsProvider {
-
-    private static final Logger log = Logger.getLogger(ChangingCredentialsProvider.class.getName());
-
-    private volatile Map<String, String> properties;
+public class ChangingCredentialsProvider extends ChangingCredentialsProviderBase {
 
     public ChangingCredentialsProvider() {
-        properties = new HashMap<>();
-        properties.put(USER_PROPERTY_NAME, "sa");
-        properties.put(PASSWORD_PROPERTY_NAME, "A_Str0ng_Required_Password");
-    }
-
-    public void changeProperties() {
-        properties = new HashMap<>();
-        properties.put(USER_PROPERTY_NAME, "user2");
-        properties.put(PASSWORD_PROPERTY_NAME, "user2_Has_A_Str0ng_Required_Password");
-    }
-
-    @Override
-    public Map<String, String> getCredentials(String credentialsProviderName) {
-        log.info("credentials provider returning " + properties);
-        return properties;
+        super("sa", "A_Str0ng_Required_Password", "user2", "user2_Has_A_Str0ng_Required_Password");
     }
 }
diff --git a/...nt/deployment/src/test/java/io/quarkus/reactive/mssql/client/ChangingCredentialsTest.java b/...nt/deployment/src/test/java/io/quarkus/reactive/mssql/client/ChangingCredentialsTest.java
@@ -1,15 +1,11 @@
 package io.quarkus.reactive.mssql.client;
 
-import static io.restassured.RestAssured.given;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.reactive.datasource.ChangingCredentialsTestBase;
 import io.quarkus.test.QuarkusUnitTest;
 
-public class ChangingCredentialsTest {
+public class ChangingCredentialsTest extends ChangingCredentialsTestBase {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -18,21 +14,7 @@ public class ChangingCredentialsTest {
                     .addClass(ChangingCredentialsTestResource.class)
                     .addAsResource("application-changing-credentials.properties", "application.properties"));
 
-    @Test
-    public void testConnect() throws Exception {
-        given()
-                .when().get("/test")
-                .then()
-                .statusCode(200)
-                .body(CoreMatchers.equalTo("dbo"));
-
-        SECONDS.sleep(2); // sleep longer than pool idle connection timeout
-
-        given()
-                .when().get("/test")
-                .then()
-                .statusCode(200)
-                .body(CoreMatchers.equalTo("user2"));
+    public ChangingCredentialsTest() {
+        super("dbo", "user2");
     }
-
 }
diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml
@@ -90,6 +90,12 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-datasource-deployment</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...eployment/src/test/java/io/quarkus/reactive/mysql/client/ChangingCredentialsProvider.java b/...eployment/src/test/java/io/quarkus/reactive/mysql/client/ChangingCredentialsProvider.java
@@ -1,36 +1,13 @@
 package io.quarkus.reactive.mysql.client;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import jakarta.enterprise.context.ApplicationScoped;
 
-import org.jboss.logging.Logger;
-
-import io.quarkus.credentials.CredentialsProvider;
+import io.quarkus.reactive.datasource.ChangingCredentialsProviderBase;
 
 @ApplicationScoped
-public class ChangingCredentialsProvider implements CredentialsProvider {
-
-    private static final Logger log = Logger.getLogger(ChangingCredentialsProvider.class.getName());
-
-    private volatile Map<String, String> properties;
+public class ChangingCredentialsProvider extends ChangingCredentialsProviderBase {
 
     public ChangingCredentialsProvider() {
-        properties = new HashMap<>();
-        properties.put(USER_PROPERTY_NAME, "hibernate_orm_test");
-        properties.put(PASSWORD_PROPERTY_NAME, "hibernate_orm_test");
-    }
-
-    public void changeProperties() {
-        properties = new HashMap<>();
-        properties.put(USER_PROPERTY_NAME, "user2");
-        properties.put(PASSWORD_PROPERTY_NAME, "user2");
-    }
-
-    @Override
-    public Map<String, String> getCredentials(String credentialsProviderName) {
-        log.info("credentials provider returning " + properties);
-        return properties;
+        super("hibernate_orm_test", "hibernate_orm_test", "user2", "user2");
     }
 }
diff --git a/...nt/deployment/src/test/java/io/quarkus/reactive/mysql/client/ChangingCredentialsTest.java b/...nt/deployment/src/test/java/io/quarkus/reactive/mysql/client/ChangingCredentialsTest.java
@@ -1,15 +1,11 @@
 package io.quarkus.reactive.mysql.client;
 
-import static io.restassured.RestAssured.given;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.reactive.datasource.ChangingCredentialsTestBase;
 import io.quarkus.test.QuarkusUnitTest;
 
-public class ChangingCredentialsTest {
+public class ChangingCredentialsTest extends ChangingCredentialsTestBase {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -18,21 +14,7 @@ public class ChangingCredentialsTest {
                     .addClass(ChangingCredentialsTestResource.class)
                     .addAsResource("application-changing-credentials.properties", "application.properties"));
 
-    @Test
-    public void testConnect() throws Exception {
-        given()
-                .when().get("/test")
-                .then()
-                .statusCode(200)
-                .body(CoreMatchers.equalTo("hibernate_orm_test@%"));
-
-        SECONDS.sleep(2); // sleep longer than pool idle connection timeout
-
-        given()
-                .when().get("/test")
-                .then()
-                .statusCode(200)
-                .body(CoreMatchers.equalTo("user2@%"));
+    public ChangingCredentialsTest() {
+        super("hibernate_orm_test@%", "user2@%");
     }
-
 }
diff --git a/extensions/reactive-oracle-client/deployment/pom.xml b/extensions/reactive-oracle-client/deployment/pom.xml
@@ -73,6 +73,12 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-datasource-deployment</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...ployment/src/test/java/io/quarkus/reactive/oracle/client/ChangingCredentialsProvider.java b/...ployment/src/test/java/io/quarkus/reactive/oracle/client/ChangingCredentialsProvider.java
@@ -1,36 +1,13 @@
 package io.quarkus.reactive.oracle.client;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import jakarta.enterprise.context.ApplicationScoped;
 
-import org.jboss.logging.Logger;
-
-import io.quarkus.credentials.CredentialsProvider;
+import io.quarkus.reactive.datasource.ChangingCredentialsProviderBase;
 
 @ApplicationScoped
-public class ChangingCredentialsProvider implements CredentialsProvider {
-
-    private static final Logger log = Logger.getLogger(ChangingCredentialsProvider.class.getName());
-
-    private volatile Map<String, String> properties;
+public class ChangingCredentialsProvider extends ChangingCredentialsProviderBase {
 
     public ChangingCredentialsProvider() {
-        properties = new HashMap<>();
-        properties.put(USER_PROPERTY_NAME, "SYSTEM");
-        properties.put(PASSWORD_PROPERTY_NAME, "hibernate_orm_test");
-    }
-
-    public void changeProperties() {
-        properties = new HashMap<>();
-        properties.put(USER_PROPERTY_NAME, "user2");
-        properties.put(PASSWORD_PROPERTY_NAME, "user2");
-    }
-
-    @Override
-    public Map<String, String> getCredentials(String credentialsProviderName) {
-        log.info("credentials provider returning " + properties);
-        return properties;
+        super("SYSTEM", "hibernate_orm_test", "user2", "user2");
     }
 }