You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/07/20 06:17:38 UTC
[shardingsphere] branch master updated: Add ITContainer.getAbbreviation (#19385)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1afefb4a8ef Add ITContainer.getAbbreviation (#19385)
1afefb4a8ef is described below
commit 1afefb4a8ef62d0916e4d6350f4f42bbc5e28431
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Jul 20 14:17:26 2022 +0800
Add ITContainer.getAbbreviation (#19385)
---
.../test/integration/container/atomic/ITContainer.java | 7 +++++++
.../test/integration/container/atomic/ITContainers.java | 11 ++++++-----
.../container/atomic/governance/impl/ZookeeperContainer.java | 5 +++++
.../integration/data/pipeline/cases/base/BaseITCase.java | 2 +-
.../framework/container/cluster/ZookeeperContainer.java | 5 +++++
.../framework/container/compose/DockerComposedContainer.java | 6 +++---
.../pipeline/framework/container/database/MySQLContainer.java | 5 +++++
.../framework/container/database/OpenGaussContainer.java | 5 +++++
.../framework/container/database/PostgreSQLContainer.java | 5 +++++
.../container/proxy/ShardingSphereProxyDockerContainer.java | 5 +++++
.../atomic/adapter/impl/ShardingSphereJDBCContainer.java | 5 +++++
.../adapter/impl/ShardingSphereProxyClusterContainer.java | 5 +++++
.../adapter/impl/ShardingSphereProxyStandaloneContainer.java | 5 +++++
.../container/atomic/storage/impl/H2Container.java | 5 +++++
.../container/atomic/storage/impl/MySQLContainer.java | 5 +++++
.../container/atomic/storage/impl/PostgreSQLContainer.java | 5 +++++
.../container/compose/mode/ClusterComposedContainer.java | 10 +++++-----
.../container/compose/mode/StandaloneComposedContainer.java | 6 +++---
18 files changed, 85 insertions(+), 17 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java
index 459bc6045f7..0a89c5734db 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java
@@ -27,4 +27,11 @@ public interface ITContainer extends Startable {
@Override
default void stop() {
}
+
+ /**
+ * Get abbreviation.
+ *
+ * @return abbreviation
+ */
+ String getAbbreviation();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java
index 118d126fb70..d5def91dfbe 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java
@@ -50,17 +50,16 @@ public final class ITContainers implements Startable {
* Register container.
*
* @param container container to be registered
- * @param type container type
* @param <T> type of container
* @return registered container
*/
- public <T extends ITContainer> T registerContainer(final T container, final String type) {
+ public <T extends ITContainer> T registerContainer(final T container) {
if (container instanceof EmbeddedITContainer) {
embeddedContainers.add((EmbeddedITContainer) container);
} else {
DockerITContainer dockerContainer = (DockerITContainer) container;
dockerContainer.setNetwork(network);
- dockerContainer.setNetworkAliases(Collections.singletonList(getNetworkAlias(container, type)));
+ dockerContainer.setNetworkAliases(Collections.singletonList(getNetworkAlias(container)));
String loggerName = String.join(":", scenario, dockerContainer.getName());
dockerContainer.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(loggerName), false));
dockerContainers.add(dockerContainer);
@@ -68,8 +67,10 @@ public final class ITContainers implements Startable {
return container;
}
- private <T extends ITContainer> String getNetworkAlias(final T container, final String type) {
- return container instanceof GovernanceContainer || Strings.isNullOrEmpty(scenario) ? String.join(".", type.toLowerCase(), "host") : String.join(".", type.toLowerCase(), scenario, "host");
+ private <T extends ITContainer> String getNetworkAlias(final T container) {
+ return container instanceof GovernanceContainer || Strings.isNullOrEmpty(scenario)
+ ? String.join(".", container.getAbbreviation(), "host")
+ : String.join(".", container.getAbbreviation(), scenario, "host");
}
@Override
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java
index 09b9cd5e0c8..229d190e2a5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java
@@ -35,4 +35,9 @@ public final class ZookeeperContainer extends GovernanceContainer {
public String getServerLists() {
return getHost() + ":" + getMappedPort(2181);
}
+
+ @Override
+ public String getAbbreviation() {
+ return "zk";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index 8fcb553abbe..1ad7e011ca0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -229,7 +229,7 @@ public abstract class BaseITCase {
private String getActualJdbcUrlTemplate(final String databaseName) {
if (ENV.getItEnvType() == ScalingITEnvTypeEnum.DOCKER) {
final DatabaseContainer databaseContainer = ((DockerComposedContainer) composedContainer).getDatabaseContainer();
- return DataSourceEnvironment.getURL(getDatabaseType(), "db.host", databaseContainer.getPort(), databaseName);
+ return DataSourceEnvironment.getURL(getDatabaseType(), getDatabaseType().getType().toLowerCase() + ".host", databaseContainer.getPort(), databaseName);
} else {
return DataSourceEnvironment.getURL(getDatabaseType(), "127.0.0.1", ENV.getActualDataSourceDefaultPort(databaseType), databaseName);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
index 7db95562b4a..5dd47f38a80 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
@@ -35,4 +35,9 @@ public final class ZookeeperContainer extends GovernanceContainer {
public String getServerLists() {
return getHost() + ":" + getMappedPort(2181);
}
+
+ @Override
+ public String getAbbreviation() {
+ return "zk";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
index 221d8f3d066..1d49b19fead 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
@@ -43,10 +43,10 @@ public final class DockerComposedContainer extends BaseComposedContainer {
public DockerComposedContainer(final DatabaseType databaseType, final String dockerImageName) {
this.databaseType = databaseType;
ShardingSphereProxyDockerContainer proxyContainer = new ShardingSphereProxyDockerContainer(databaseType);
- governanceContainer = getContainers().registerContainer(new ZookeeperContainer(), "zk");
- databaseContainer = getContainers().registerContainer(DatabaseContainerFactory.newInstance(databaseType, dockerImageName), "db");
+ governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
+ databaseContainer = getContainers().registerContainer(DatabaseContainerFactory.newInstance(databaseType, dockerImageName));
proxyContainer.dependsOn(governanceContainer, databaseContainer);
- this.proxyContainer = getContainers().registerContainer(proxyContainer, "shardingsphere-proxy");
+ this.proxyContainer = getContainers().registerContainer(proxyContainer);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
index 1ca1c30fb08..004f319f773 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
@@ -70,4 +70,9 @@ public final class MySQLContainer extends DatabaseContainer {
public int getPort() {
return port;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "mysql";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
index be1af172114..46a32de71bc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
@@ -74,4 +74,9 @@ public final class OpenGaussContainer extends DatabaseContainer {
public int getPort() {
return port;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "openguass";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
index 333bbde6f37..edb115398ae 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
@@ -73,4 +73,9 @@ public final class PostgreSQLContainer extends DatabaseContainer {
public int getPort() {
return port;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "postgresql";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
index d2b1c2023a2..996a47813e7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
@@ -55,4 +55,9 @@ public final class ShardingSphereProxyDockerContainer extends DockerITContainer
withClasspathResourceMapping(String.format("/env/%s/server.yaml", databaseType.getType().toLowerCase()), "/opt/shardingsphere-proxy/conf/server.yaml", BindMode.READ_ONLY);
withClasspathResourceMapping("/env/logback.xml", "/opt/shardingsphere-proxy/conf/logback.xml", BindMode.READ_ONLY);
}
+
+ @Override
+ public String getAbbreviation() {
+ return "proxy";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
index 3c41b36478c..2a797461f69 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
@@ -98,4 +98,9 @@ public final class ShardingSphereJDBCContainer implements EmbeddedITContainer, A
result.setOverwrite(false);
return result;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "jdbc";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index ac82b86d71b..9f72bc30da2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -94,4 +94,9 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
return result;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "proxy";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index 84897b5415a..bc95f27b30a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -96,4 +96,9 @@ public final class ShardingSphereProxyStandaloneContainer extends DockerITContai
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
return result;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "proxy";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/H2Container.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/H2Container.java
index 92ecabc7ba2..a342d623192 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/H2Container.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/H2Container.java
@@ -74,4 +74,9 @@ public final class H2Container extends EmbeddedStorageContainer {
RunScript.execute(connection, reader);
}
}
+
+ @Override
+ public String getAbbreviation() {
+ return "h2";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/MySQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/MySQLContainer.java
index 8cc58ce53d6..ba9a15be399 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/MySQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/MySQLContainer.java
@@ -42,4 +42,9 @@ public final class MySQLContainer extends DockerStorageContainer {
protected int getPort() {
return 3306;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "mysql";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
index 206e9293714..871803f79ac 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
@@ -68,4 +68,9 @@ public final class PostgreSQLContainer extends DockerStorageContainer {
protected int getPort() {
return 5432;
}
+
+ @Override
+ public String getAbbreviation() {
+ return "postgresql";
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
index aaa335132b3..29791e87c94 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
@@ -48,14 +48,14 @@ public final class ClusterComposedContainer implements ComposedContainer {
String scenario = parameterizedArray.getScenario();
containers = new ITContainers(scenario);
// TODO support other types of governance
- governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"), "zk");
- storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), scenario), parameterizedArray.getDatabaseType().getType());
- AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(parameterizedArray.getMode(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), storageContainer,
- scenario);
+ governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"));
+ storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), scenario));
+ AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(
+ parameterizedArray.getMode(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), storageContainer, scenario);
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(governanceContainer, storageContainer);
}
- this.adapterContainer = containers.registerContainer(adapterContainer, parameterizedArray.getAdapter());
+ this.adapterContainer = containers.registerContainer(adapterContainer);
}
@Override
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
index 50b323ff1fd..edf6958df0f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
@@ -43,9 +43,9 @@ public final class StandaloneComposedContainer implements ComposedContainer {
public StandaloneComposedContainer(final ParameterizedArray parameterizedArray) {
String scenario = parameterizedArray.getScenario();
containers = new ITContainers(scenario);
- storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), scenario), parameterizedArray.getDatabaseType().getType());
- adapterContainer = containers.registerContainer(AdapterContainerFactory.newInstance(
- parameterizedArray.getMode(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), storageContainer, scenario), parameterizedArray.getAdapter());
+ storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), scenario));
+ adapterContainer = containers.registerContainer(
+ AdapterContainerFactory.newInstance(parameterizedArray.getMode(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), storageContainer, scenario));
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(storageContainer);
}