Merge test container (#32871)

* Merge ShardingSphereJdbcContainer. * Merge ShardingSphereProxyContainer. * Merge MySQLContainer. * Merge ITContainers.
apache · Sep 19, 2024 · e58cf80 · e58cf80
1 parent 14ce350
commit e58cf80
Show file tree

Hide file tree

Showing 25 changed files with 383 additions and 462 deletions.
diff --git a/...src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ITContainers.java b/...src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ITContainers.java
diff --git a/...c/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/MySQLContainer.java b/...c/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/MySQLContainer.java
diff --git a/...ontainer/ShardingSphereJdbcContainer.java → ...ner/ShardingSphereJdbcAgentContainer.java b/...ontainer/ShardingSphereJdbcContainer.java → ...ner/ShardingSphereJdbcAgentContainer.java
@@ -31,17 +31,16 @@
 /**
  * ShardingSphere jdbc container.
  */
-// TODO Merge test container: merge with org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereJdbcContainer
-public final class ShardingSphereJdbcContainer extends DockerITContainer {
+public final class ShardingSphereJdbcAgentContainer extends DockerITContainer {
 
     private static final String CONFIG_PATH_IN_CONTAINER = "/opt/shardingsphere-jdbc-app/";
 
     private final String plugin;
 
     private final Consumer<OutputFrame> consumer;
 
-    public ShardingSphereJdbcContainer(final String image, final String plugin, final Consumer<OutputFrame> consumer) {
-        super("jdbc", image);
+    public ShardingSphereJdbcAgentContainer(final String image, final String plugin, final Consumer<OutputFrame> consumer) {
+        super("jdbc-agent", image);
         this.consumer = consumer;
         this.plugin = plugin;
     }
@@ -64,6 +63,6 @@ private Map<String, String> createResourceMappingForProxy() {
 
     @Override
     public String getAbbreviation() {
-        return "jdbc";
+        return "jdbc-agent";
     }
 }
diff --git a/...g/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereProxyContainer.java b/...g/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereProxyContainer.java