From 47df821c6d435cbf855b9b14ff0ad93533c99c7f Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Thu, 2 Nov 2023 10:56:55 -0400
Subject: [PATCH] DBZ-7085 Don't use MySQL test artifacts in JDBC storage tests

---
 .../storage/jdbc/JdbcOffsetBackingStoreIT.java      | 11 ++++++-----
 .../storage/jdbc/history/JdbcSchemaHistoryIT.java   | 13 +++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java
index 717727efe..531585223 100644
--- a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java
+++ b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java
@@ -30,9 +30,9 @@
 import io.debezium.config.Configuration;
 import io.debezium.connector.mysql.MySqlConnector;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
-import io.debezium.connector.mysql.MySqlTestConnection;
 import io.debezium.embedded.AbstractConnectorTest;
 import io.debezium.jdbc.JdbcConfiguration;
+import io.debezium.jdbc.JdbcConnection;
 import io.debezium.junit.SkipWhenDatabaseVersion;
 import io.debezium.relational.history.SchemaHistory;
 import io.debezium.storage.jdbc.history.JdbcSchemaHistory;
@@ -81,7 +81,7 @@ public void beforeEach() throws SQLException {
         initializeConnectorTestFramework();
         Testing.Files.delete(SCHEMA_HISTORY_PATH);
 
-        try (MySqlTestConnection conn = testConnection()) {
+        try (JdbcConnection conn = testConnection()) {
             conn.execute(
                     "DROP TABLE IF EXISTS schematest",
                     "CREATE TABLE schematest (id INT PRIMARY KEY, val VARCHAR(16))",
@@ -100,7 +100,7 @@ public void afterEach() throws SQLException {
             Testing.Files.delete(SCHEMA_HISTORY_PATH);
         }
 
-        try (MySqlTestConnection conn = testConnection()) {
+        try (JdbcConnection conn = testConnection()) {
             conn.execute("DROP TABLE IF EXISTS schematest");
         }
     }
@@ -146,7 +146,7 @@ private Configuration.Builder config(String jdbcUrl) {
         return schemaHistory(builder);
     }
 
-    private MySqlTestConnection testConnection() {
+    private JdbcConnection testConnection() {
         final JdbcConfiguration jdbcConfig = JdbcConfiguration.create()
                 .withHostname(container.getHost())
                 .withPort(container.getMappedPort(PORT))
@@ -154,7 +154,8 @@ private MySqlTestConnection testConnection() {
                 .withPassword(PRIVILEGED_PASSWORD)
                 .withDatabase(DBNAME)
                 .build();
-        return new MySqlTestConnection(jdbcConfig);
+        final String url = "jdbc:mysql://${hostname}:${port}/${dbname}";
+        return new JdbcConnection(jdbcConfig, JdbcConnection.patternBasedFactory(url), "`", "`");
     }
 
     @Test
diff --git a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java
index 35db543f4..4199bda1b 100644
--- a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java
+++ b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java
@@ -31,9 +31,9 @@
 import io.debezium.connector.mysql.MySqlConnector;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
 import io.debezium.connector.mysql.MySqlConnectorConfig.SnapshotMode;
-import io.debezium.connector.mysql.MySqlTestConnection;
 import io.debezium.embedded.AbstractConnectorTest;
 import io.debezium.jdbc.JdbcConfiguration;
+import io.debezium.jdbc.JdbcConnection;
 import io.debezium.relational.history.SchemaHistory;
 import io.debezium.storage.jdbc.offset.JdbcOffsetBackingStoreConfig;
 import io.debezium.util.Testing;
@@ -76,7 +76,7 @@ public void beforeEach() throws SQLException {
         initializeConnectorTestFramework();
         Testing.Files.delete(SCHEMA_HISTORY_PATH);
 
-        try (MySqlTestConnection conn = testConnection()) {
+        try (JdbcConnection conn = testConnection()) {
             conn.execute(
                     "DROP TABLE IF EXISTS schematest",
                     "CREATE TABLE schematest (id INT PRIMARY KEY, val VARCHAR(16))",
@@ -95,7 +95,7 @@ public void afterEach() throws SQLException {
             Testing.Files.delete(SCHEMA_HISTORY_PATH);
         }
 
-        try (MySqlTestConnection conn = testConnection()) {
+        try (JdbcConnection conn = testConnection()) {
             conn.execute("DROP TABLE IF EXISTS schematest");
         }
     }
@@ -137,7 +137,7 @@ private Configuration.Builder config() throws IOException {
         return schemaHistory(builder);
     }
 
-    private MySqlTestConnection testConnection() {
+    private JdbcConnection testConnection() {
         final JdbcConfiguration jdbcConfig = JdbcConfiguration.create()
                 .withHostname(container.getHost())
                 .withPort(container.getMappedPort(PORT))
@@ -145,7 +145,8 @@ private MySqlTestConnection testConnection() {
                 .withPassword(PRIVILEGED_PASSWORD)
                 .withDatabase(DBNAME)
                 .build();
-        return new MySqlTestConnection(jdbcConfig);
+        final String url = "jdbc:mysql://${hostname}:${port}/${dbname}";
+        return new JdbcConnection(jdbcConfig, JdbcConnection.patternBasedFactory(url), "`", "`");
     }
 
     @Test
@@ -188,7 +189,7 @@ public void shouldStreamChangesAfterRestart() throws InterruptedException, SQLEx
 
         stopConnector();
 
-        try (MySqlTestConnection conn = testConnection()) {
+        try (JdbcConnection conn = testConnection()) {
             conn.execute("INSERT INTO schematest VALUES (5, 'five')");
         }
         // Start the connector ...