Use Quarkus Derby DevServices for SQL integration test

Fixes #5633
apache · Jan 4, 2024 · 61232e9 · 61232e9
1 parent 2055a79
commit 61232e9
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 208 deletions.
diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml
@@ -51,7 +51,6 @@
         <module>kafka</module>
         <module>mongodb</module>
         <module>process-executor-support</module>
-        <module>sql-derby-support</module>
         <module>test-support</module>
         <module>mock-backend</module>
         <module>wiremock</module>

diff --git a/integration-tests-support/sql-derby-support/README.adoc b/integration-tests-support/sql-derby-support/README.adoc
diff --git a/integration-tests-support/sql-derby-support/pom.xml b/integration-tests-support/sql-derby-support/pom.xml
diff --git a/integration-tests/sql/.gitignore b/integration-tests/sql/.gitignore
@@ -0,0 +1 @@
+derby.log
diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml
@@ -75,11 +75,6 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-integration-tests-support-sql-derby</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
@@ -195,25 +190,6 @@
                     <value>derby</value>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>process-sources</phase>
-                                <goals>
-                                    <goal>copy-dependencies</goal>
-                                </goals>
-                                <configuration>
-                                    <includeArtifactIds>camel-quarkus-integration-tests-support-sql-derby</includeArtifactIds>
-                                    <outputDirectory>target/test-classes/derby/</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
             <dependencies>
                 <dependency>
                     <groupId>io.quarkus</groupId>

diff --git a/...n-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlDbInitializer.java b/...n-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlDbInitializer.java
@@ -43,13 +43,7 @@ public class SqlDbInitializer {
     String dbKind;
 
     public void initDb() throws SQLException, IOException {
-
         runScripts("initDb.sql");
-
-        if (SqlHelper.useDocker()) {
-            //docker execution may require more sql scripts
-            runScripts("initDb_docker.sql");
-        }
     }
 
     private void runScripts(String fileName) throws SQLException, IOException {

diff --git a/.../src/main/java/test/AddNumsProcedure.java → ...dproc/derby/NumberAddStoredProcedure.java b/.../src/main/java/test/AddNumsProcedure.java → ...dproc/derby/NumberAddStoredProcedure.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test;
+package org.apache.camel.quarkus.component.sql.it.storedproc.derby;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class AddNumsProcedure {
-
-    public static void testProc(int a, int b) throws SQLException {
-        String sql = "insert into ADD_NUMS_RESULTS (id, value) VALUES (1, " + (a + b) + ")";
-
+public class NumberAddStoredProcedure {
+    public static void addNumbers(int a, int b) throws SQLException {
+        String sql = "INSERT INTO ADD_NUMS_RESULTS (id, value) VALUES (1, " + (a + b) + ")";
         try (Connection con = DriverManager.getConnection("jdbc:default:connection");
                 PreparedStatement ps = con.prepareStatement(sql)) {
             ps.execute();

diff --git a/integration-tests/sql/src/main/resources/sql/derby/initDb.sql b/integration-tests/sql/src/main/resources/sql/derby/initDb.sql
@@ -40,4 +40,4 @@ CREATE TABLE aggregation_completed (id VARCHAR(255) NOT NULL, exchange BLOB NOT
 DROP TABLE ADD_NUMS_RESULTS
 CREATE TABLE ADD_NUMS_RESULTS (id INT PRIMARY KEY, value INT NOT NULL)
 
-CREATE PROCEDURE ADD_NUMS(IN a INTEGER, IN b INTEGER) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'test.AddNumsProcedure.testProc'
+CREATE PROCEDURE ADD_NUMS(IN a INTEGER, IN b INTEGER) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.apache.camel.quarkus.component.sql.it.storedproc.derby.NumberAddStoredProcedure.addNumbers'
diff --git a/integration-tests/sql/src/main/resources/sql/derby/initDb_docker.sql b/integration-tests/sql/src/main/resources/sql/derby/initDb_docker.sql
diff --git a/...-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/DerbyTestResource.java b/...-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/DerbyTestResource.java
diff --git a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -33,12 +32,10 @@
 import org.hamcrest.text.IsEqualIgnoringCase;
 import org.junit.jupiter.api.Test;
 
-import static io.restassured.RestAssured.given;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.*;
 
 @QuarkusTest
-@QuarkusTestResource(DerbyTestResource.class)
 class SqlTest {
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -218,7 +218,6 @@
         <consul.container.image>docker.io/hashicorp/consul:1.16</consul.container.image>
         <couchbase.container.image>docker.io/couchbase/server:7.2.0</couchbase.container.image>
         <couchdb.container.image>docker.io/couchdb:2.3.1</couchdb.container.image>
-        <derby.container.image>docker.io/az82/docker-derby:10.16</derby.container.image>
         <eclipse-mosquitto.container.image>docker.io/eclipse-mosquitto:1.6.15</eclipse-mosquitto.container.image>
         <eclipse-temurin.container.image>eclipse-temurin:17-ubi9-minimal</eclipse-temurin.container.image>
         <elasticsearch.container.image>docker.io/elasticsearch:8.8.1</elasticsearch.container.image>

diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
@@ -208,11 +208,6 @@
                 <artifactId>camel-quarkus-integration-tests-support-mongodb</artifactId>
                 <version>${camel-quarkus.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-integration-tests-support-sql-derby</artifactId>
-                <version>${camel-quarkus.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
                 <artifactId>camel-quarkus-integration-wiremock-support</artifactId>