You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/02/14 05:35:05 UTC
[shardingsphere] branch master updated: Remove compose setter on ParameterizedArray (#15393)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 d96f237 Remove compose setter on ParameterizedArray (#15393)
d96f237 is described below
commit d96f237cde842ee8af1a781f6de1ccbcc3bbfe9a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Feb 14 13:33:42 2022 +0800
Remove compose setter on ParameterizedArray (#15393)
* Refactor SingleITCase
* Refactor ComposedContainer
* Remove compose setter on ParameterizedArray
* Remove compose setter on ParameterizedArray
* Release ComposedContainerRegistry by every class
* Release ComposedContainerRegistry by every class
---
.../test/integration/engine/BaseITCase.java | 22 ++++++++++++-----
.../test/integration/engine/BatchITCase.java | 5 ++--
.../test/integration/engine/SingleITCase.java | 13 +++++-----
.../test/integration/engine/dal/BaseDALIT.java | 5 ++--
.../test/integration/engine/dal/GeneralDALIT.java | 18 +++++++-------
.../test/integration/engine/dcl/BaseDCLIT.java | 5 ++--
.../test/integration/engine/dcl/GeneralDCLIT.java | 20 ++++++++--------
.../test/integration/engine/ddl/BaseDDLIT.java | 5 ++--
.../test/integration/engine/ddl/GeneralDDLIT.java | 20 ++++++++--------
.../integration/engine/dml/AdditionalDMLIT.java | 20 ++++++++--------
.../test/integration/engine/dml/BaseDMLIT.java | 5 ++--
.../test/integration/engine/dml/BatchDMLIT.java | 20 ++++++++--------
.../test/integration/engine/dml/GeneralDMLIT.java | 20 ++++++++--------
.../integration/engine/dql/AdditionalDQLIT.java | 22 ++++++++---------
.../test/integration/engine/dql/BaseDQLIT.java | 5 ++--
.../test/integration/engine/dql/GeneralDQLIT.java | 22 ++++++++---------
.../test/integration/engine/ral/BaseRALIT.java | 5 ++--
.../test/integration/engine/ral/GeneralRALIT.java | 18 +++++++-------
.../test/integration/engine/rdl/BaseRDLIT.java | 5 ++--
.../test/integration/engine/rdl/GeneralRDLIT.java | 18 +++++++-------
.../test/integration/engine/rql/BaseRQLIT.java | 5 ++--
.../test/integration/engine/rql/GeneralRQLIT.java | 18 +++++++-------
.../container/atomic/AtomicContainers.java | 5 ++--
...Manager.java => ComposedContainerRegistry.java} | 28 ++++++++++------------
.../compose/mode/ClusterComposedContainer.java | 13 +++++-----
.../compose/mode/MemoryComposedContainer.java | 8 +++----
.../param/model/AssertionParameterizedArray.java | 7 +-----
.../param/model/CaseParameterizedArray.java | 5 ----
.../framework/param/model/ParameterizedArray.java | 15 ------------
29 files changed, 188 insertions(+), 189 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
index 86a5889..4bd0031 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
@@ -22,9 +22,11 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCase;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.ShardingSphereIntegrationTestParameterized;
import org.junit.After;
+import org.junit.Before;
import org.junit.runner.RunWith;
import javax.sql.DataSource;
@@ -51,23 +53,31 @@ public abstract class BaseITCase {
private final IntegrationTestCase integrationTestCase;
- private final Map<String, DataSource> actualDataSourceMap;
+ private final ComposedContainer composedContainer;
- private final DataSource targetDataSource;
+ private Map<String, DataSource> actualDataSourceMap;
- public BaseITCase(final ParameterizedArray parameterizedArray) {
+ private DataSource targetDataSource;
+
+ public BaseITCase(final ParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
adapter = parameterizedArray.getAdapter();
scenario = parameterizedArray.getScenario();
databaseType = parameterizedArray.getDatabaseType();
sqlCommandType = parameterizedArray.getSqlCommandType();
integrationTestCase = parameterizedArray.getTestCaseContext().getTestCase();
- actualDataSourceMap = parameterizedArray.getCompose().getActualDataSourceMap();
- targetDataSource = parameterizedArray.getCompose().getTargetDataSource();
+ this.composedContainer = composedContainer;
+ }
+
+ @Before
+ public void setUp() {
+ composedContainer.getContainers().start();
+ actualDataSourceMap = composedContainer.getActualDataSourceMap();
+ targetDataSource = composedContainer.getTargetDataSource();
}
@After
public void tearDown() throws Exception {
- // TODO Closing data sources gracefully.
+ // TODO Close data sources gracefully.
// if (targetDataSource instanceof AutoCloseable) {
// ((AutoCloseable) targetDataSource).close();
// }
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
index ae31e60..9ac76f3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
@@ -29,6 +29,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
import org.junit.Before;
@@ -60,8 +61,8 @@ public abstract class BatchITCase extends BaseITCase {
private DataSetEnvironmentManager dataSetEnvironmentManager;
- public BatchITCase(final CaseParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BatchITCase(final CaseParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
this.parentPath = parameterizedArray.getTestCaseContext().getParentPath();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
index 2059d6d..765d69a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
@@ -19,11 +19,12 @@ package org.apache.shardingsphere.test.integration.engine;
import lombok.AccessLevel;
import lombok.Getter;
+import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSet;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
-import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.watcher.ITWatcher;
import org.junit.Rule;
@@ -45,11 +46,11 @@ public abstract class SingleITCase extends BaseITCase {
private final DataSet dataSet;
- public SingleITCase(final AssertionParameterizedArray parameter) {
- super(parameter);
- this.sqlExecuteType = parameter.getSqlExecuteType();
- this.assertion = parameter.getAssertion();
- this.dataSet = null == assertion ? null : DataSetLoader.load(parameter.getTestCaseContext().getParentPath(), getScenario(), getDatabaseType(), assertion.getExpectedDataFile());
+ public SingleITCase(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
+ this.sqlExecuteType = parameterizedArray.getSqlExecuteType();
+ this.assertion = parameterizedArray.getAssertion();
+ this.dataSet = null == assertion ? null : DataSetLoader.load(parameterizedArray.getTestCaseContext().getParentPath(), getScenario(), getDatabaseType(), assertion.getExpectedDataFile());
}
protected final String getSQL() throws ParseException {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java
index bf2930a..0ba78ae 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/BaseDALIT.java
@@ -21,6 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import java.sql.ResultSet;
@@ -38,8 +39,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseDALIT extends SingleITCase {
- public BaseDALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDALIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
protected final void assertResultSet(final ResultSet resultSet) throws SQLException {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
index 97a0ca3..56f203f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.integration.engine.dal;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -39,23 +39,25 @@ import java.util.stream.Collectors;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class GeneralDALIT extends BaseDALIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralDALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralDALIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DAL)
- .stream()
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DAL).stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
.collect(Collectors.toList());
}
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
+ }
+
@Test
public void assertExecute() throws SQLException, ParseException {
try (Connection connection = getTargetDataSource().getConnection()) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java
index 1d3aa54..0ccade3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/BaseDCLIT.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dcl;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import org.apache.shardingsphere.test.integration.env.authority.AuthorityEnvironmentManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.junit.Before;
@@ -27,8 +28,8 @@ public abstract class BaseDCLIT extends SingleITCase {
private AuthorityEnvironmentManager authorityEnvironmentManager;
- public BaseDCLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDCLIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
@Before
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
index 8289485..a4a9e42 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.integration.engine.dcl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -32,24 +32,24 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.Collection;
-import java.util.stream.Collectors;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class GeneralDCLIT extends BaseDCLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralDCLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralDCLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DCL)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DCL);
+ }
+
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
index 4b4b03f..dff3558 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
@@ -25,6 +25,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetIndex;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.junit.Before;
@@ -46,8 +47,8 @@ import static org.junit.Assert.assertThat;
public abstract class BaseDDLIT extends SingleITCase {
- public BaseDDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDDLIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
@Before
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
index 289ea46..d9495ef 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.integration.engine.ddl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -34,26 +34,26 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-import java.util.stream.Collectors;
import static org.junit.Assert.assertFalse;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class GeneralDDLIT extends BaseDDLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralDDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralDDLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DDL)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DDL);
+ }
+
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
index 1f2dd25..83f096c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
@@ -21,12 +21,12 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -37,31 +37,31 @@ import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
import java.util.Collections;
-import java.util.stream.Collectors;
import static org.junit.Assert.assertFalse;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class AdditionalDMLIT extends BaseDMLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public AdditionalDMLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(AdditionalDMLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
if (IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases()) {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML);
}
return Collections.emptyList();
}
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
+ }
+
@Test
public void executeUpdateWithAutoGeneratedKeys() throws SQLException, ParseException {
// TODO fix replica_query
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
index 99653f9..ea7fdd5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
@@ -25,6 +25,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.database.DatabaseAssertionMetaData;
import org.apache.shardingsphere.test.integration.framework.database.DatabaseAssertionMetaDataFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
@@ -49,8 +50,8 @@ public abstract class BaseDMLIT extends SingleITCase {
private DataSetEnvironmentManager dataSetEnvironmentManager;
- public BaseDMLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public BaseDMLIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
@Before
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
index 15b41dd..862ef72 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
@@ -21,13 +21,13 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.BatchITCase;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -36,7 +36,6 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.Collection;
-import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -44,19 +43,20 @@ import static org.junit.Assert.assertThat;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class BatchDMLIT extends BatchITCase {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public BatchDMLIT(final CaseParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(BatchDMLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<ParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getCaseParameterized(SQLCommandType.DML)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getCaseParameterized(SQLCommandType.DML);
+ }
+
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
index c568b09..a8396a5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.test.integration.engine.dml;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -35,26 +35,26 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-import java.util.stream.Collectors;
import static org.junit.Assert.assertFalse;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class GeneralDMLIT extends BaseDMLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralDMLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralDMLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML);
+ }
+
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
index 4127b76..fe34ecc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
@@ -21,12 +21,12 @@ import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -38,31 +38,31 @@ import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
import java.util.Collections;
-import java.util.stream.Collectors;
import static org.junit.Assert.assertTrue;
@ParallelRuntimeStrategy(ParallelLevel.CASE)
public final class AdditionalDQLIT extends BaseDQLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
- public AdditionalDQLIT(final AssertionParameterizedArray parameter) {
- super(parameter);
+ public AdditionalDQLIT(final AssertionParameterizedArray parameterizedArray) {
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(AdditionalDQLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
if (IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases()) {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL);
}
return Collections.emptyList();
}
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
+ }
+
@Test
public void assertExecuteQueryWithResultSetTypeAndResultSetConcurrency() throws SQLException, ParseException {
try (Connection connection = getTargetDataSource().getConnection()) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
index 9930bad..f8fee10 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
@@ -23,6 +23,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.junit.Before;
@@ -47,8 +48,8 @@ public abstract class BaseDQLIT extends SingleITCase {
private static final Collection<String> FILLED_SCENARIOS = new HashSet<>();
- public BaseDQLIT(final AssertionParameterizedArray parameter) {
- super(parameter);
+ public BaseDQLIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
@Before
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
index fd98774..a931780 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.test.integration.engine.dql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -36,26 +36,26 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.text.ParseException;
import java.util.Collection;
-import java.util.stream.Collectors;
import static org.junit.Assert.assertTrue;
@ParallelRuntimeStrategy(ParallelLevel.CASE)
public final class GeneralDQLIT extends BaseDQLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
- public GeneralDQLIT(final AssertionParameterizedArray parameter) {
- super(parameter);
+ public GeneralDQLIT(final AssertionParameterizedArray parameterizedArray) {
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralDQLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL)
- .stream()
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
- .collect(Collectors.toList());
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL);
+ }
+
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
index 00afff7..16b7b4d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.junit.Before;
@@ -39,8 +40,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseRALIT extends SingleITCase {
- public BaseRALIT(final AssertionParameterizedArray parameter) {
- super(parameter);
+ public BaseRALIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
@Before
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
index c44f8e7..de0ced4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.integration.engine.ral;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -39,23 +39,25 @@ import java.util.stream.Collectors;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class GeneralRALIT extends BaseRALIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralRALIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralRALIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RAL)
- .stream()
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RAL).stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
.collect(Collectors.toList());
}
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
+ }
+
@Test
public void assertExecute() throws SQLException, ParseException {
try (Connection connection = getTargetDataSource().getConnection()) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
index 91641eb..9809335 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.junit.Before;
@@ -40,8 +41,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseRDLIT extends SingleITCase {
- public BaseRDLIT(final AssertionParameterizedArray parameter) {
- super(parameter);
+ public BaseRDLIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
@Before
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
index 11d0189..f56c300 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.integration.engine.rdl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -39,23 +39,25 @@ import java.util.stream.Collectors;
@ParallelRuntimeStrategy(ParallelLevel.SCENARIO)
public final class GeneralRDLIT extends BaseRDLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralRDLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralRDLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RDL)
- .stream()
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RDL).stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
.collect(Collectors.toList());
}
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
+ }
+
@Test
public void assertExecute() throws SQLException, ParseException {
try (Connection connection = getTargetDataSource().getConnection()) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java
index 34c56f3..02905e5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/BaseRQLIT.java
@@ -21,6 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import java.sql.ResultSet;
@@ -36,8 +37,8 @@ import static org.junit.Assert.assertTrue;
public abstract class BaseRQLIT extends SingleITCase {
- public BaseRQLIT(final AssertionParameterizedArray parameter) {
- super(parameter);
+ public BaseRQLIT(final AssertionParameterizedArray parameterizedArray, final ComposedContainer composedContainer) {
+ super(parameterizedArray, composedContainer);
}
protected final void assertResultSet(final ResultSet resultSet) throws SQLException {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
index f417d3a8..bd49cfe 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
@@ -19,12 +19,12 @@ package org.apache.shardingsphere.test.integration.engine.rql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerManager;
+import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
-import org.junit.ClassRule;
+import org.junit.AfterClass;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -39,23 +39,25 @@ import java.util.stream.Collectors;
@ParallelRuntimeStrategy(ParallelLevel.CASE)
public final class GeneralRQLIT extends BaseRQLIT {
- @ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
+ private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
public GeneralRQLIT(final AssertionParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ super(parameterizedArray, COMPOSED_CONTAINER_REGISTRY.getComposedContainer(GeneralRQLIT.class.getSimpleName(), parameterizedArray));
}
@Parameters(name = "{0}")
public static Collection<AssertionParameterizedArray> getParameters() {
- return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RQL)
- .stream()
+ return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RQL).stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
.collect(Collectors.toList());
}
+ @AfterClass
+ public static void closeContainers() {
+ COMPOSED_CONTAINER_REGISTRY.close();
+ }
+
@Test
public void assertExecute() throws SQLException, ParseException {
try (Connection connection = getTargetDataSource().getConnection()) {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java
index c5e9221..7d0c589 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java
@@ -44,15 +44,16 @@ public final class AtomicContainers implements AutoCloseable {
/**
* Register container.
*
+ * @param testSuiteName test suite name
* @param container container to be registered
* @param containerType container type
* @param <T> type of ShardingSphere container
* @return registered container
*/
- public <T extends AtomicContainer> T registerContainer(final T container, final String containerType) {
+ public <T extends AtomicContainer> T registerContainer(final String testSuiteName, final T container, final String containerType) {
container.setNetwork(network);
container.setNetworkAliases(Collections.singletonList(String.join(".", containerType.toLowerCase(), scenario, "host")));
- String loggerName = String.join(":", container.getName(), container.getContainerId());
+ String loggerName = String.join(":", testSuiteName, container.getName());
container.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(loggerName), true));
containers.add(container);
return container;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerRegistry.java
similarity index 65%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerRegistry.java
index e532d91..567e0c7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerRegistry.java
@@ -20,50 +20,46 @@ package org.apache.shardingsphere.test.integration.framework.container.compose;
import org.apache.shardingsphere.test.integration.framework.container.compose.mode.ClusterComposedContainer;
import org.apache.shardingsphere.test.integration.framework.container.compose.mode.MemoryComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
-import org.junit.rules.ExternalResource;
import java.util.HashMap;
import java.util.Map;
/**
- * Composed container manager.
+ * Composed container registry.
*/
-public final class ComposedContainerManager extends ExternalResource {
+public final class ComposedContainerRegistry implements AutoCloseable {
private final Map<String, ComposedContainer> composedContainers = new HashMap<>();
/**
* Get composed container.
*
+ * @param testSuiteName test suite name
* @param parameterizedArray parameterized array
* @return composed container
*/
- public ComposedContainer getComposedContainer(final ParameterizedArray parameterizedArray) {
- String key = generateKey(parameterizedArray);
+ public ComposedContainer getComposedContainer(final String testSuiteName, final ParameterizedArray parameterizedArray) {
+ String key = generateKey(testSuiteName, parameterizedArray);
if (composedContainers.containsKey(key)) {
return composedContainers.get(key);
}
- ComposedContainer result = createComposedContainer(parameterizedArray);
+ ComposedContainer result = createComposedContainer(testSuiteName, parameterizedArray);
composedContainers.put(key, result);
return result;
}
- private ComposedContainer createComposedContainer(final ParameterizedArray parameterizedArray) {
+ private ComposedContainer createComposedContainer(final String testSuiteName, final ParameterizedArray parameterizedArray) {
// TODO fix sharding_governance
- return "sharding_governance".equals(parameterizedArray.getScenario()) ? new ClusterComposedContainer(parameterizedArray) : new MemoryComposedContainer(parameterizedArray);
+ return "sharding_governance".equals(parameterizedArray.getScenario())
+ ? new ClusterComposedContainer(testSuiteName, parameterizedArray) : new MemoryComposedContainer(testSuiteName, parameterizedArray);
}
- private String generateKey(final ParameterizedArray parameterizedArray) {
- return String.join("-", parameterizedArray.getScenario(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType().getName());
+ private String generateKey(final String testSuiteName, final ParameterizedArray parameterizedArray) {
+ return String.join("-", testSuiteName, parameterizedArray.getScenario(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType().getName());
}
@Override
- protected void before() {
- composedContainers.values().forEach(each -> each.getContainers().start());
- }
-
- @Override
- protected void after() {
+ public void close() {
composedContainers.values().forEach(each -> each.getContainers().close());
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
index 9967691..6b3cf01 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
@@ -36,23 +36,22 @@ import java.util.Map;
*/
public final class ClusterComposedContainer implements ComposedContainer {
- private final GovernanceContainer governanceContainer;
-
@Getter
private final AtomicContainers containers;
- @Getter
+ private final GovernanceContainer governanceContainer;
+
private final StorageContainer storageContainer;
private final AdapterContainer adapterContainer;
- public ClusterComposedContainer(final ParameterizedArray parameterizedArray) {
+ public ClusterComposedContainer(final String testSuiteName, final ParameterizedArray parameterizedArray) {
containers = new AtomicContainers(parameterizedArray.getScenario());
// TODO support other types of governance
- governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"), "zk");
- storageContainer = containers.registerContainer(
+ governanceContainer = containers.registerContainer(testSuiteName, GovernanceContainerFactory.newInstance("ZooKeeper"), "zk");
+ storageContainer = containers.registerContainer(testSuiteName,
StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()), parameterizedArray.getDatabaseType().getName());
- adapterContainer = containers.registerContainer(
+ adapterContainer = containers.registerContainer(testSuiteName,
AdapterContainerFactory.newInstance(parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()), parameterizedArray.getAdapter());
adapterContainer.dependsOn(governanceContainer, storageContainer);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java
index 2e572eb..d190de9 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java
@@ -32,20 +32,20 @@ import java.util.Map;
/**
* Memory composed container.
*/
-@Getter
public final class MemoryComposedContainer implements ComposedContainer {
+ @Getter
private final AtomicContainers containers;
private final StorageContainer storageContainer;
private final AdapterContainer adapterContainer;
- public MemoryComposedContainer(final ParameterizedArray parameterizedArray) {
+ public MemoryComposedContainer(final String testSuiteName, final ParameterizedArray parameterizedArray) {
containers = new AtomicContainers(parameterizedArray.getScenario());
- storageContainer = containers.registerContainer(
+ storageContainer = containers.registerContainer(testSuiteName,
StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()), parameterizedArray.getDatabaseType().getName());
- adapterContainer = containers.registerContainer(
+ adapterContainer = containers.registerContainer(testSuiteName,
AdapterContainerFactory.newInstance(parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()), parameterizedArray.getAdapter());
adapterContainer.dependsOn(storageContainer);
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
index 08f3e56..aa84569 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
@@ -19,13 +19,11 @@ package org.apache.shardingsphere.test.integration.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Setter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
+import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
/**
* Parameterized array of assertion based integration test.
@@ -48,9 +46,6 @@ public final class AssertionParameterizedArray implements ParameterizedArray {
private final SQLCommandType sqlCommandType;
- @Setter
- private ComposedContainer compose;
-
@Override
public String toString() {
return String.format("%s: %s -> %s -> %s -> %s", adapter, scenario, databaseType.getName(), sqlExecuteType, testCaseContext.getTestCase().getSql());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
index 35381ae..ef7d5fc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
@@ -19,11 +19,9 @@ package org.apache.shardingsphere.test.integration.framework.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Setter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
/**
* Parameterized array of case based integration test.
@@ -42,9 +40,6 @@ public final class CaseParameterizedArray implements ParameterizedArray {
private final SQLCommandType sqlCommandType;
- @Setter
- private ComposedContainer compose;
-
@Override
public String toString() {
return String.format("%s: %s -> %s -> %s", adapter, scenario, databaseType.getName(), testCaseContext.getTestCase().getSql());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
index 49cdf96..27fa182 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.test.integration.framework.param.model;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
/**
* Parameterized array.
@@ -61,18 +60,4 @@ public interface ParameterizedArray {
* @return SQL command type
*/
SQLCommandType getSqlCommandType();
-
- /**
- * Get container compose.
- *
- * @return container compose
- */
- ComposedContainer getCompose();
-
- /**
- * Set container compose.
- *
- * @param compose container compose
- */
- void setCompose(ComposedContainer compose);
}