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 89f17d8 Merge ParameterizedWrapper and ParameterizedArray (#9430)
89f17d8 is described below
commit 89f17d8f56389ebf94366885d9c2c42852758f71
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Feb 19 11:33:09 2021 +0800
Merge ParameterizedWrapper and ParameterizedArray (#9430)
* Cleanup code
* Rename param.model
* Simplify ParameterizedArray
* Add more methods for ParameterizedArray
* Merge ParameterizedWrapper and ParameterizedArray
* Revert engine-env.properties
---
.../integration/engine/it/dal/GeneralDALIT.java | 23 ++++-----
.../integration/engine/it/dcl/GeneralDCLIT.java | 20 ++++----
.../integration/engine/it/ddl/GeneralDDLIT.java | 20 ++++----
.../integration/engine/it/dml/AdditionalDMLIT.java | 22 ++++-----
.../test/integration/engine/it/dml/BatchDMLIT.java | 18 +++----
.../integration/engine/it/dml/GeneralDMLIT.java | 22 ++++-----
.../integration/engine/it/dql/AdditionalDQLIT.java | 22 ++++-----
.../integration/engine/it/dql/GeneralDQLIT.java | 22 ++++-----
.../integration/engine/junit/ITRunnerExecutor.java | 6 +--
.../engine/junit/ITRunnerParallelExecutor.java | 6 +--
.../engine/junit/ITRunnerScenariosExecutor.java | 15 +++---
.../engine/junit/ITRunnerScheduler.java | 16 +++----
.../engine/junit/ITRunnerSerialExecutor.java | 6 +--
.../engine/param/ParameterizedArrayFactory.java | 8 ++--
.../engine/param/domain/ParameterizedWrapper.java | 55 ----------------------
.../AssertionParameterizedArray.java | 9 +---
.../{domain => model}/CaseParameterizedArray.java | 9 +---
.../{domain => model}/ParameterizedArray.java | 39 ++++++++++++---
18 files changed, 146 insertions(+), 192 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/GeneralDALIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/GeneralDALIT.java
index 96b6834..d44d5f4 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/GeneralDALIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dal/GeneralDALIT.java
@@ -20,7 +20,8 @@ package
org.apache.shardingsphere.test.integration.engine.it.dal;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -39,21 +40,21 @@ import static org.junit.Assert.assertThat;
public final class GeneralDALIT extends BaseDALIT {
- public GeneralDALIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
+ public GeneralDALIT(final AssertionParameterizedArray parameterizedArray)
throws IOException, JAXBException, SQLException, ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
}
@Parameters(name = "{0}")
public static Collection<Object[]> getParameters() {
return
ParameterizedArrayFactory.getAssertionParameterizedArray(SQLCommandType.DAL).stream()
- .filter(each -> "proxy".equals(((ParameterizedWrapper)
each[0]).getAdapter())
- && SQLExecuteType.Literal == ((ParameterizedWrapper)
each[0]).getSqlExecuteType()).collect(Collectors.toList());
+ .filter(each -> "proxy".equals(((ParameterizedArray)
each[0]).getAdapter())
+ && each[0] instanceof AssertionParameterizedArray &&
SQLExecuteType.Literal == ((AssertionParameterizedArray)
each[0]).getSqlExecuteType()).collect(Collectors.toList());
}
@SuppressWarnings("JUnitTestMethodWithNoAssertions")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
index 7d23dcb..c6ac86b 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dcl/GeneralDCLIT.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.test.integration.engine.it.dcl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -33,14 +33,14 @@ import java.util.Collection;
public final class GeneralDCLIT extends BaseDCLIT {
- public GeneralDCLIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
+ public GeneralDCLIT(final AssertionParameterizedArray parameterizedArray)
throws IOException, JAXBException, SQLException, ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
index d0d14b3..89ee6fd 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/GeneralDDLIT.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.test.integration.engine.it.ddl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -33,14 +33,14 @@ import java.util.Collection;
public final class GeneralDDLIT extends BaseDDLIT {
- public GeneralDDLIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
+ public GeneralDDLIT(final AssertionParameterizedArray parameterizedArray)
throws IOException, JAXBException, SQLException, ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
index 44f5da6..8ceacb4 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/AdditionalDMLIT.java
@@ -19,10 +19,10 @@ package
org.apache.shardingsphere.test.integration.engine.it.dml;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -43,15 +43,15 @@ public final class AdditionalDMLIT extends BaseDMLIT {
private final IntegrationTestCaseAssertion assertion;
- public AdditionalDMLIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
- this.assertion = parameterizedWrapper.getAssertion();
+ public AdditionalDMLIT(final AssertionParameterizedArray
parameterizedArray) throws IOException, JAXBException, SQLException,
ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
+ assertion = parameterizedArray.getAssertion();
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
index c2025c9..8624207 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/BatchDMLIT.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.test.integration.engine.it.dml;
-import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
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.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.it.BatchIT;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.CaseParameterizedArray;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -42,13 +42,13 @@ public final class BatchDMLIT extends BatchIT {
private final IntegrationTestCaseContext testCaseContext;
- public BatchDMLIT(final ParameterizedWrapper parameterizedWrapper) throws
IOException, JAXBException, SQLException {
- super(parameterizedWrapper.getTestCaseContext(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
- this.testCaseContext = parameterizedWrapper.getTestCaseContext();
+ public BatchDMLIT(final CaseParameterizedArray parameterizedArray) throws
IOException, JAXBException, SQLException {
+ super(parameterizedArray.getTestCaseContext(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
+ testCaseContext = parameterizedArray.getTestCaseContext();
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
index 12f91e3..64758ec 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dml/GeneralDMLIT.java
@@ -19,10 +19,10 @@ package
org.apache.shardingsphere.test.integration.engine.it.dml;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -41,15 +41,15 @@ public final class GeneralDMLIT extends BaseDMLIT {
private final IntegrationTestCaseAssertion assertion;
- public GeneralDMLIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
- this.assertion = parameterizedWrapper.getAssertion();
+ public GeneralDMLIT(final AssertionParameterizedArray parameterizedArray)
throws IOException, JAXBException, SQLException, ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
+ assertion = parameterizedArray.getAssertion();
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
index 503cdcb..3ffa29a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
@@ -19,10 +19,10 @@ package
org.apache.shardingsphere.test.integration.engine.it.dql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -44,15 +44,15 @@ public final class AdditionalDQLIT extends BaseDQLIT {
private final IntegrationTestCaseAssertion assertion;
- public AdditionalDQLIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
- this.assertion = parameterizedWrapper.getAssertion();
+ public AdditionalDQLIT(final AssertionParameterizedArray
parameterizedArray) throws IOException, JAXBException, SQLException,
ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
+ assertion = parameterizedArray.getAssertion();
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
index d2dd649..6ade722 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/GeneralDQLIT.java
@@ -19,10 +19,10 @@ package
org.apache.shardingsphere.test.integration.engine.it.dql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
-import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import
org.apache.shardingsphere.test.integration.engine.param.ParameterizedArrayFactory;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import org.apache.shardingsphere.test.integration.engine.param.SQLExecuteType;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
import org.junit.Test;
import org.junit.runners.Parameterized.Parameters;
@@ -42,15 +42,15 @@ public final class GeneralDQLIT extends BaseDQLIT {
private final IntegrationTestCaseAssertion assertion;
- public GeneralDQLIT(final ParameterizedWrapper parameterizedWrapper)
throws IOException, JAXBException, SQLException, ParseException {
- super(parameterizedWrapper.getTestCaseContext().getParentPath(),
- parameterizedWrapper.getAssertion(),
- parameterizedWrapper.getAdapter(),
- parameterizedWrapper.getScenario(),
- parameterizedWrapper.getDatabaseType(),
- parameterizedWrapper.getSqlExecuteType(),
-
parameterizedWrapper.getTestCaseContext().getTestCase().getSql());
- this.assertion = parameterizedWrapper.getAssertion();
+ public GeneralDQLIT(final AssertionParameterizedArray parameterizedArray)
throws IOException, JAXBException, SQLException, ParseException {
+ super(parameterizedArray.getTestCaseContext().getParentPath(),
+ parameterizedArray.getAssertion(),
+ parameterizedArray.getAdapter(),
+ parameterizedArray.getScenario(),
+ parameterizedArray.getDatabaseType(),
+ parameterizedArray.getSqlExecuteType(),
+
parameterizedArray.getTestCaseContext().getTestCase().getSql());
+ assertion = parameterizedArray.getAssertion();
}
@Parameters(name = "{0}")
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerExecutor.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerExecutor.java
index e2f03a9..73a94f9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerExecutor.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.engine.junit;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
/**
* IT runner executor.
@@ -27,10 +27,10 @@ public interface ITRunnerExecutor {
/**
* Execute child statement.
*
- * @param parameterizedWrapper parameterized wrapper
+ * @param parameterizedArray parameterized array
* @param childStatement child statement
*/
- void execute(ParameterizedWrapper parameterizedWrapper, Runnable
childStatement);
+ void execute(ParameterizedArray parameterizedArray, Runnable
childStatement);
/**
* Override to implement any behavior that must occur after all children
have been scheduled (for example, waiting for them all to finish).
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerParallelExecutor.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerParallelExecutor.java
index a7bceb1..fb3c7fd 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerParallelExecutor.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerParallelExecutor.java
@@ -17,9 +17,8 @@
package org.apache.shardingsphere.test.integration.engine.junit;
-import lombok.Getter;
import
org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorServiceManager;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
@@ -27,7 +26,6 @@ import java.util.concurrent.TimeUnit;
/**
* IT runner parallel executor.
*/
-@Getter
public final class ITRunnerParallelExecutor implements ITRunnerExecutor {
private final ExecutorServiceManager executorServiceManager;
@@ -37,7 +35,7 @@ public final class ITRunnerParallelExecutor implements
ITRunnerExecutor {
}
@Override
- public void execute(final ParameterizedWrapper parameterizedWrapper, final
Runnable childStatement) {
+ public void execute(final ParameterizedArray parameterizedArray, final
Runnable childStatement) {
executorServiceManager.getExecutorService().submit(childStatement);
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScenariosExecutor.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScenariosExecutor.java
index 21339a7..fbe112d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScenariosExecutor.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScenariosExecutor.java
@@ -29,25 +29,22 @@ import com.lmax.disruptor.Sequence;
import com.lmax.disruptor.SequenceReportingEventHandler;
import com.lmax.disruptor.dsl.Disruptor;
import com.lmax.disruptor.dsl.ProducerType;
-import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
+import java.util.LinkedList;
import java.util.Set;
import java.util.concurrent.ThreadFactory;
/**
* IT runner scenarios executor.
*/
-@Getter
@Slf4j
public final class ITRunnerScenariosExecutor implements ITRunnerExecutor {
@@ -55,7 +52,7 @@ public final class ITRunnerScenariosExecutor implements
ITRunnerExecutor {
private final RingBuffer<CaseEntryEvent> ringBuffer;
- private final List<CaseEventHandler> caseEventHandlers;
+ private final Collection<CaseEventHandler> caseEventHandlers;
@SneakyThrows
public ITRunnerScenariosExecutor() {
@@ -67,7 +64,7 @@ public final class ITRunnerScenariosExecutor implements
ITRunnerExecutor {
Collection<String> adapters = integrationTestEnvironment.getAdapters();
Collection<String> scenarios =
integrationTestEnvironment.getScenarios();
Set<DatabaseType> databaseTypes =
integrationTestEnvironment.getDataSourceEnvironments().keySet();
- caseEventHandlers = new ArrayList<>();
+ caseEventHandlers = new LinkedList<>();
initCaseEventHandlers(adapters, scenarios, databaseTypes);
CaseEventHandler[] caseEventHandlerArray = new
CaseEventHandler[caseEventHandlers.size()];
caseEventHandlers.toArray(caseEventHandlerArray);
@@ -95,10 +92,10 @@ public final class ITRunnerScenariosExecutor implements
ITRunnerExecutor {
}
@Override
- public void execute(final ParameterizedWrapper parameterizedWrapper, final
Runnable childStatement) {
+ public void execute(final ParameterizedArray parameterizedArray, final
Runnable childStatement) {
ringBuffer.publishEvent((e, seq) -> {
e.reset();
- e.setCaseKey(new CaseKey(parameterizedWrapper.getAdapter(),
parameterizedWrapper.getScenario(),
parameterizedWrapper.getDatabaseType().getName()));
+ e.setCaseKey(new CaseKey(parameterizedArray.getAdapter(),
parameterizedArray.getScenario(),
parameterizedArray.getDatabaseType().getName()));
e.setChildStatement(childStatement);
});
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
index e23b376..36564aa2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import org.junit.runners.model.RunnerScheduler;
import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
@@ -79,18 +79,18 @@ public final class ITRunnerScheduler implements
RunnerScheduler {
}
BlockJUnit4ClassRunnerWithParameters runner =
(BlockJUnit4ClassRunnerWithParameters) runnerField.get(childStatement);
Object[] parameters = (Object[]) parametersField.get(runner);
- ParameterizedWrapper parameterizedWrapper = (ParameterizedWrapper)
parameters[0];
-
getITRunnerExecutor(parameterizedWrapper).execute(parameterizedWrapper,
childStatement);
+ ParameterizedArray parameterizedArray = (ParameterizedArray)
parameters[0];
+ getITRunnerExecutor(parameterizedArray).execute(parameterizedArray,
childStatement);
}
- private ITRunnerExecutor getITRunnerExecutor(final ParameterizedWrapper
parameterizedWrapper) {
- switch (parameterizedWrapper.getSqlCommandType()) {
+ private ITRunnerExecutor getITRunnerExecutor(final ParameterizedArray
parameterizedArray) {
+ switch (parameterizedArray.getSqlCommandType()) {
case DQL:
- return
runnerExecutors.get(getRunnerExecutorKey(parameterizedWrapper.getDatabaseType().getName(),
SQLCommandType.DQL.name()));
+ return
runnerExecutors.get(getRunnerExecutorKey(parameterizedArray.getDatabaseType().getName(),
SQLCommandType.DQL.name()));
case DDL:
- return
runnerExecutors.get(getRunnerExecutorKey(parameterizedWrapper.getDatabaseType().getName(),
SQLCommandType.DDL.name()));
+ return
runnerExecutors.get(getRunnerExecutorKey(parameterizedArray.getDatabaseType().getName(),
SQLCommandType.DDL.name()));
default:
- return
runnerExecutors.get(getRunnerExecutorKey(parameterizedWrapper.getDatabaseType().getName(),
""));
+ return
runnerExecutors.get(getRunnerExecutorKey(parameterizedArray.getDatabaseType().getName(),
""));
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerSerialExecutor.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerSerialExecutor.java
index d9590ca..aae7959 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerSerialExecutor.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerSerialExecutor.java
@@ -17,17 +17,15 @@
package org.apache.shardingsphere.test.integration.engine.junit;
-import lombok.Getter;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedWrapper;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
/**
* IT runner serial executor.
*/
-@Getter
public final class ITRunnerSerialExecutor implements ITRunnerExecutor {
@Override
- public void execute(final ParameterizedWrapper parameterizedWrapper, final
Runnable childStatement) {
+ public void execute(final ParameterizedArray parameterizedArray, final
Runnable childStatement) {
childStatement.run();
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
index fbff714..d310763 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
@@ -28,9 +28,9 @@ import
org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseConte
import
org.apache.shardingsphere.test.integration.cases.IntegrationTestCasesLoader;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.AssertionParameterizedArray;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.CaseParameterizedArray;
-import
org.apache.shardingsphere.test.integration.engine.param.domain.ParameterizedArray;
+import
org.apache.shardingsphere.test.integration.engine.param.model.AssertionParameterizedArray;
+import
org.apache.shardingsphere.test.integration.engine.param.model.CaseParameterizedArray;
+import
org.apache.shardingsphere.test.integration.engine.param.model.ParameterizedArray;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
import java.util.Collection;
@@ -152,6 +152,6 @@ public final class ParameterizedArrayFactory {
}
private static List<Object[]> toArrays(final
Collection<ParameterizedArray> parameterizedArrays) {
- return
parameterizedArrays.stream().map(ParameterizedArray::toArrays).collect(Collectors.toList());
+ return parameterizedArrays.stream().map(each -> new
Object[]{each}).collect(Collectors.toList());
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/ParameterizedWrapper.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/ParameterizedWrapper.java
deleted file mode 100644
index 071739f..0000000
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/ParameterizedWrapper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.integration.engine.param.domain;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-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.engine.param.SQLExecuteType;
-
-/**
- * Parameterized wrapper based integration test.
- */
-@RequiredArgsConstructor
-@Getter
-public final class ParameterizedWrapper {
-
- private final IntegrationTestCaseContext testCaseContext;
-
- private final IntegrationTestCaseAssertion assertion;
-
- private final String adapter;
-
- private final String scenario;
-
- private final DatabaseType databaseType;
-
- private final SQLExecuteType sqlExecuteType;
-
- private final SQLCommandType sqlCommandType;
-
- private final ParameterizedArray parameterizedArray;
-
- @Override
- public String toString() {
- return parameterizedArray.getIndividualTestCaseIdentify();
- }
-}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/AssertionParameterizedArray.java
similarity index 88%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/AssertionParameterizedArray.java
index 2e8501b..90294ce 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/AssertionParameterizedArray.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/AssertionParameterizedArray.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.engine.param.domain;
+package org.apache.shardingsphere.test.integration.engine.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -47,12 +47,7 @@ public final class AssertionParameterizedArray implements
ParameterizedArray {
private final SQLCommandType sqlCommandType;
@Override
- public Object[] toArrays() {
- return new Object[] {new ParameterizedWrapper(testCaseContext,
assertion, adapter, scenario, databaseType, sqlExecuteType, sqlCommandType,
this)};
- }
-
- @Override
- public String getIndividualTestCaseIdentify() {
+ 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/engine/param/domain/CaseParameterizedArray.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/CaseParameterizedArray.java
similarity index 87%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/CaseParameterizedArray.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/CaseParameterizedArray.java
index aa2a4c9..e862e14 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/CaseParameterizedArray.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/CaseParameterizedArray.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.engine.param.domain;
+package org.apache.shardingsphere.test.integration.engine.param.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -41,12 +41,7 @@ public final class CaseParameterizedArray implements
ParameterizedArray {
private final SQLCommandType sqlCommandType;
@Override
- public Object[] toArrays() {
- return new Object[] {new ParameterizedWrapper(testCaseContext, null,
adapter, scenario, databaseType, null, sqlCommandType, this)};
- }
-
- @Override
- public String getIndividualTestCaseIdentify() {
+ 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/engine/param/domain/ParameterizedArray.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/ParameterizedArray.java
similarity index 56%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/ParameterizedArray.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/ParameterizedArray.java
index ffb1631..49028a9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/domain/ParameterizedArray.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/model/ParameterizedArray.java
@@ -15,7 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.engine.param.domain;
+package org.apache.shardingsphere.test.integration.engine.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;
/**
* Parameterized array.
@@ -23,16 +27,37 @@ package
org.apache.shardingsphere.test.integration.engine.param.domain;
public interface ParameterizedArray {
/**
- * To parameterized arrays.
+ * Get test case context.
+ *
+ * @return test case context
+ */
+ IntegrationTestCaseContext getTestCaseContext();
+
+ /**
+ * Get adapter.
+ *
+ * @return adapter
+ */
+ String getAdapter();
+
+ /**
+ * Get scenario.
+ *
+ * @return scenario
+ */
+ String getScenario();
+
+ /**
+ * Get database type.
*
- * @return parameterized arrays
+ * @return database type
*/
- Object[] toArrays();
+ DatabaseType getDatabaseType();
/**
- * Get identify of individual test cases in a parameterized test.
+ * Get SQL command type.
*
- * @return identify of individual test cases
+ * @return SQL command type
*/
- String getIndividualTestCaseIdentify();
+ SQLCommandType getSqlCommandType();
}
