Replaced old redis sink tests, fixed maven to properly run ITs and tests

debezium · Feb 20, 2024 · 252e21e · 252e21e
1 parent dcfa8e1
commit 252e21e
Show file tree

Hide file tree

Showing 25 changed files with 83 additions and 1,034 deletions.
diff --git a/debezium-server-redis/pom.xml b/debezium-server-redis/pom.xml
@@ -12,7 +12,10 @@
     <packaging>jar</packaging>
 
     <properties>
+        <quarkus.container-image.build>true</quarkus.container-image.build>
         <quarkus.jib.jvm-entrypoint>java</quarkus.jib.jvm-entrypoint>
+        <quarkus.container-image.group>debezium-server-test</quarkus.container-image.group>
+        <quarkus.container-image.name>${artifactId}</quarkus.container-image.name>
     </properties>
 
     <dependencies>
@@ -154,9 +157,18 @@
                     <systemPropertyVariables>
                         <test.version.debezium>${version.debezium}</test.version.debezium>
                         <test.server.image.group>${quarkus.container-image.group}</test.server.image.group>
+                        <test.server.image.name>${quarkus.container-image.name}</test.server.image.name>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <!-- Make sure surefire doesn't run integration tests that are ran by failsafe -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>**/*IT.java</excludes>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <!-- Apply the properties set in the POM to the resource files -->

diff --git a/...edis/wip/DebeziumServerConfigBuilder.java → ...er/redis/DebeziumServerConfigBuilder.java b/...edis/wip/DebeziumServerConfigBuilder.java → ...er/redis/DebeziumServerConfigBuilder.java
@@ -3,14 +3,14 @@
  *
  * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
-package io.debezium.server.redis.wip;
+package io.debezium.server.redis;
 
-import static io.debezium.server.redis.wip.TestConstants.MYSQL_DATABASE;
-import static io.debezium.server.redis.wip.TestConstants.MYSQL_PASSWORD;
-import static io.debezium.server.redis.wip.TestConstants.MYSQL_PORT;
-import static io.debezium.server.redis.wip.TestConstants.MYSQL_USER;
-import static io.debezium.server.redis.wip.TestConstants.REDIS_PORT;
-import static io.debezium.server.redis.wip.TestConstants.REDIS_SSL_PORT;
+import static io.debezium.server.redis.TestConstants.MYSQL_DATABASE;
+import static io.debezium.server.redis.TestConstants.MYSQL_PASSWORD;
+import static io.debezium.server.redis.TestConstants.MYSQL_PORT;
+import static io.debezium.server.redis.TestConstants.MYSQL_USER;
+import static io.debezium.server.redis.TestConstants.REDIS_PORT;
+import static io.debezium.server.redis.TestConstants.REDIS_SSL_PORT;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...dis/wip/DebeziumTestContainerWrapper.java → ...r/redis/DebeziumTestContainerWrapper.java b/...dis/wip/DebeziumTestContainerWrapper.java → ...r/redis/DebeziumTestContainerWrapper.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
-package io.debezium.server.redis.wip;
+package io.debezium.server.redis;
 
 import static org.awaitility.Awaitility.await;
 import static org.testcontainers.containers.output.OutputFrame.OutputType.STDOUT;

diff --git a/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisOffsetIT.java b/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisOffsetIT.java
diff --git a/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisOffsetTestProfile.java b/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisOffsetTestProfile.java
diff --git a/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisSSLStreamIT.java b/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisSSLStreamIT.java
diff --git a/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisSSLStreamTestProfile.java b/debezium-server-redis/src/test/java/io/debezium/server/redis/RedisSSLStreamTestProfile.java
diff --git a/...er-redis/src/test/java/io/debezium/server/redis/RedisSSLTestResourceLifecycleManager.java b/...er-redis/src/test/java/io/debezium/server/redis/RedisSSLTestResourceLifecycleManager.java