You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2020/12/26 16:01:10 UTC
[shardingsphere] branch master updated: Rename
IntegrateTestCaseType (#8788)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 275339f Rename IntegrateTestCaseType (#8788)
275339f is described below
commit 275339f490d457eb444481b59aa6eb5ade3ba7f6
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Dec 27 00:00:45 2020 +0800
Rename IntegrateTestCaseType (#8788)
* Update javadoc
* Rename IntegrateTestCaseType
---
.../IntegrateTestCaseType.java} | 6 ++--
.../cases/assertion/IntegrateTestCasesLoader.java | 33 +++++++++++-----------
.../test/integration/engine/dcl/GeneralDCLIT.java | 4 +--
.../test/integration/engine/ddl/GeneralDDLIT.java | 4 +--
.../integration/engine/dml/AdditionalDMLIT.java | 4 +--
.../test/integration/engine/dml/BatchDMLIT.java | 4 +--
.../test/integration/engine/dml/GeneralDMLIT.java | 4 +--
.../integration/engine/dql/AdditionalDQLIT.java | 4 +--
.../test/integration/engine/dql/GeneralDQLIT.java | 4 +--
.../engine/util/IntegrateTestParameters.java | 18 ++++++------
.../test/integration/env/EnvironmentPath.java | 8 +++---
.../env/dataset/DataSetEnvironmentManager.java | 30 +++++++++-----------
12 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SQLType.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCaseType.java
similarity index 95%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SQLType.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCaseType.java
index 97e7b28..5e6effd 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SQLType.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/IntegrateTestCaseType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.engine;
+package org.apache.shardingsphere.test.integration.cases;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -28,11 +28,11 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectState
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.TCLStatement;
/**
- * SQL Type.
+ * Integrate test case type.
*/
@RequiredArgsConstructor
@Getter
-public enum SQLType {
+public enum IntegrateTestCaseType {
/**
* Data Query Language.
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCasesLoader.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCasesLoader.java
index 93e7b7c..25daa94 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCasesLoader.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrateTestCasesLoader.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.test.integration.cases.assertion.dml.DMLIntegra
import org.apache.shardingsphere.test.integration.cases.assertion.dql.DQLIntegrateTestCases;
import org.apache.shardingsphere.test.integration.cases.assertion.root.IntegrateTestCase;
import org.apache.shardingsphere.test.integration.cases.assertion.root.IntegrateTestCases;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -53,7 +53,7 @@ public final class IntegrateTestCasesLoader {
private static final IntegrateTestCasesLoader INSTANCE = new IntegrateTestCasesLoader();
- private final Map<SQLType, List<? extends IntegrateTestCase>> integrateTestCases = new LinkedHashMap<>();
+ private final Map<IntegrateTestCaseType, List<? extends IntegrateTestCase>> integrateTestCases = new LinkedHashMap<>();
/**
* Get singleton instance.
@@ -66,39 +66,40 @@ public final class IntegrateTestCasesLoader {
/**
* Get integrate test cases.
- * @param sqlType SQL type
+ *
+ * @param caseType integration test case type
* @return integrate test cases
*/
- public List<? extends IntegrateTestCase> getTestCases(final SQLType sqlType) {
- integrateTestCases.putIfAbsent(sqlType, loadIntegrateTestCases(sqlType));
- return integrateTestCases.get(sqlType);
+ public List<? extends IntegrateTestCase> getTestCases(final IntegrateTestCaseType caseType) {
+ integrateTestCases.putIfAbsent(caseType, loadIntegrateTestCases(caseType));
+ return integrateTestCases.get(caseType);
}
@SneakyThrows({IOException.class, URISyntaxException.class, JAXBException.class})
- private List<? extends IntegrateTestCase> loadIntegrateTestCases(final SQLType sqlType) {
+ private List<? extends IntegrateTestCase> loadIntegrateTestCases(final IntegrateTestCaseType caseType) {
URL url = IntegrateTestCasesLoader.class.getClassLoader().getResource("integrate/cases/");
Preconditions.checkNotNull(url, "Cannot found integrate test cases.");
- return loadIntegrateTestCases(url, sqlType);
+ return loadIntegrateTestCases(url, caseType);
}
- private List<? extends IntegrateTestCase> loadIntegrateTestCases(final URL url, final SQLType sqlType) throws IOException, URISyntaxException, JAXBException {
- List<String> files = getFiles(url, sqlType);
+ private List<? extends IntegrateTestCase> loadIntegrateTestCases(final URL url, final IntegrateTestCaseType caseType) throws IOException, URISyntaxException, JAXBException {
+ List<String> files = getFiles(url, caseType);
Preconditions.checkNotNull(files, "Cannot found integrate test cases.");
List<? extends IntegrateTestCase> result = new LinkedList<>();
for (String each : files) {
- result = unmarshal(each, sqlType).getIntegrateTestCases();
+ result = unmarshal(each, caseType).getIntegrateTestCases();
result.forEach(testCase -> testCase.setPath(each));
}
return result;
}
- private static List<String> getFiles(final URL url, final SQLType sqlType) throws IOException, URISyntaxException {
+ private static List<String> getFiles(final URL url, final IntegrateTestCaseType caseType) throws IOException, URISyntaxException {
List<String> result = new LinkedList<>();
Files.walkFileTree(Paths.get(url.toURI()), new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(final Path file, final BasicFileAttributes basicFileAttributes) {
- if (file.getFileName().toString().startsWith(sqlType.getFilePrefix()) && file.getFileName().toString().endsWith(".xml")) {
+ if (file.getFileName().toString().startsWith(caseType.getFilePrefix()) && file.getFileName().toString().endsWith(".xml")) {
result.add(file.toFile().getPath());
}
return FileVisitResult.CONTINUE;
@@ -107,9 +108,9 @@ public final class IntegrateTestCasesLoader {
return result;
}
- private static IntegrateTestCases unmarshal(final String integrateCasesFile, final SQLType sqlType) throws IOException, JAXBException {
+ private static IntegrateTestCases unmarshal(final String integrateCasesFile, final IntegrateTestCaseType caseType) throws IOException, JAXBException {
try (FileReader reader = new FileReader(integrateCasesFile)) {
- switch (sqlType) {
+ switch (caseType) {
case DQL:
return (DQLIntegrateTestCases) JAXBContext.newInstance(DQLIntegrateTestCases.class).createUnmarshaller().unmarshal(reader);
case DML:
@@ -119,7 +120,7 @@ public final class IntegrateTestCasesLoader {
case DCL:
return (DCLIntegrateTestCases) JAXBContext.newInstance(DCLIntegrateTestCases.class).createUnmarshaller().unmarshal(reader);
default:
- throw new UnsupportedOperationException(sqlType.getFilePrefix());
+ throw new UnsupportedOperationException(caseType.getFilePrefix());
}
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
index 97d24b0..bdb6a48 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.dcl;
import org.apache.shardingsphere.test.integration.cases.assertion.dcl.DCLIntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.junit.Test;
@@ -41,7 +41,7 @@ public final class GeneralDCLIT extends BaseDCLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestParameters.getParametersWithAssertion(SQLType.DCL);
+ return IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DCL);
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
index 9f0ba2c..b30cc42 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
@@ -21,7 +21,7 @@ import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import org.apache.shardingsphere.test.integration.cases.assertion.ddl.DDLIntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.junit.Test;
@@ -46,7 +46,7 @@ public final class GeneralDDLIT extends BaseDDLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {1} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestParameters.getParametersWithAssertion(SQLType.DDL);
+ return IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DDL);
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
index 4cd5f6f..5afc99d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dml;
import org.apache.shardingsphere.test.integration.cases.assertion.dml.DMLIntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValue;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
@@ -51,7 +51,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {1} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestEnvironment.getInstance().isRunAdditionalTestCases() ? IntegrateTestParameters.getParametersWithAssertion(SQLType.DML) : Collections.emptyList();
+ return IntegrateTestEnvironment.getInstance().isRunAdditionalTestCases() ? IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DML) : Collections.emptyList();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
index 10aa8f3..bf47d4d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.integration.cases.assertion.root.Integrate
import org.apache.shardingsphere.test.integration.cases.assertion.root.IntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValue;
import org.apache.shardingsphere.test.integration.engine.BatchIT;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.junit.Test;
@@ -50,7 +50,7 @@ public final class BatchDMLIT extends BatchIT {
@Parameters(name = "Rule:{1} -> {2} -> {3}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestParameters.getParametersWithCase(SQLType.DML);
+ return IntegrateTestParameters.getParametersWithCase(IntegrateTestCaseType.DML);
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
index 0aaec79..2373994 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dml;
import org.apache.shardingsphere.test.integration.cases.assertion.dml.DMLIntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValue;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.junit.Test;
@@ -53,7 +53,7 @@ public final class GeneralDMLIT extends BaseDMLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {1} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestParameters.getParametersWithAssertion(SQLType.DML);
+ return IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DML);
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
index f01dbad..1823b93 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dql;
import org.apache.shardingsphere.test.integration.cases.assertion.dql.DQLIntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValue;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
@@ -52,7 +52,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {1} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestEnvironment.getInstance().isRunAdditionalTestCases() ? IntegrateTestParameters.getParametersWithAssertion(SQLType.DQL) : Collections.emptyList();
+ return IntegrateTestEnvironment.getInstance().isRunAdditionalTestCases() ? IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DQL) : Collections.emptyList();
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
index d3f7e53..e409a1b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dql;
import org.apache.shardingsphere.test.integration.cases.assertion.dql.DQLIntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValue;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.engine.util.IntegrateTestParameters;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.junit.Test;
@@ -50,7 +50,7 @@ public final class GeneralDQLIT extends BaseDQLIT {
@Parameters(name = "{2} -> {3} -> {4} -> {1} -> {5}")
public static Collection<Object[]> getParameters() {
- return IntegrateTestParameters.getParametersWithAssertion(SQLType.DQL);
+ return IntegrateTestParameters.getParametersWithAssertion(IntegrateTestCaseType.DQL);
}
@Test
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/util/IntegrateTestParameters.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/util/IntegrateTestParameters.java
index 8155d5a..cbaf508 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/util/IntegrateTestParameters.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/util/IntegrateTestParameters.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.test.integration.cases.assertion.IntegrateTestC
import org.apache.shardingsphere.test.integration.cases.assertion.root.IntegrateTestCase;
import org.apache.shardingsphere.test.integration.cases.assertion.root.IntegrateTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLCaseType;
-import org.apache.shardingsphere.test.integration.engine.SQLType;
+import org.apache.shardingsphere.test.integration.cases.IntegrateTestCaseType;
import org.apache.shardingsphere.test.integration.env.IntegrateTestEnvironment;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
@@ -56,13 +56,13 @@ public final class IntegrateTestParameters {
/**
* Get parameters with assertions.
*
- * @param sqlType SQL type
- * @return integrate test parameters.
+ * @param caseType integrate test case type
+ * @return integrate test parameters
*/
- public static Collection<Object[]> getParametersWithAssertion(final SQLType sqlType) {
+ public static Collection<Object[]> getParametersWithAssertion(final IntegrateTestCaseType caseType) {
Map<DatabaseType, Collection<Object[]>> availableCases = new LinkedHashMap<>();
Map<DatabaseType, Collection<Object[]>> disabledCases = new LinkedHashMap<>();
- INTEGRATE_TEST_CASES_LOADER.getTestCases(sqlType).forEach(integrateTestCase -> getDatabaseTypes(integrateTestCase.getDbTypes()).forEach(databaseType -> {
+ INTEGRATE_TEST_CASES_LOADER.getTestCases(caseType).forEach(integrateTestCase -> getDatabaseTypes(integrateTestCase.getDbTypes()).forEach(databaseType -> {
if (IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(databaseType)) {
availableCases.putIfAbsent(databaseType, new LinkedList<>());
Arrays.stream(SQLCaseType.values()).forEach(sqlCaseType -> availableCases.get(databaseType).addAll(getParametersWithAssertion(databaseType, sqlCaseType, integrateTestCase)));
@@ -106,13 +106,13 @@ public final class IntegrateTestParameters {
/**
* Get parameters with test cases.
*
- * @param sqlType SQL type
- * @return integrate test parameters.
+ * @param caseType integrate test case type
+ * @return integrate test parameters
*/
- public static Collection<Object[]> getParametersWithCase(final SQLType sqlType) {
+ public static Collection<Object[]> getParametersWithCase(final IntegrateTestCaseType caseType) {
Map<DatabaseType, Collection<Object[]>> availableCases = new LinkedHashMap<>();
Map<DatabaseType, Collection<Object[]>> disabledCases = new LinkedHashMap<>();
- INTEGRATE_TEST_CASES_LOADER.getTestCases(sqlType).forEach(integrateTestCase ->
+ INTEGRATE_TEST_CASES_LOADER.getTestCases(caseType).forEach(integrateTestCase ->
getDatabaseTypes(integrateTestCase.getDbTypes()).forEach(databaseType -> {
if (IntegrateTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(databaseType)) {
availableCases.putIfAbsent(databaseType, new LinkedList<>());
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
index 0f4326e..a402ae4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
@@ -39,7 +39,7 @@ public final class EnvironmentPath {
private static final String AUTHORITY_RESOURCES_PATH = "integrate/env/%s/authority.xml";
/**
- * Get database environment resource File.
+ * Get database environment resource file.
*
* @param ruleType rule type
* @return database environment resource file
@@ -49,7 +49,7 @@ public final class EnvironmentPath {
}
/**
- * Get data initialize resource File.
+ * Get data initialize resource file.
*
* @param ruleType rule type
* @return data initialize resource file
@@ -59,7 +59,7 @@ public final class EnvironmentPath {
}
/**
- * Get rule resource File.
+ * Get rule resource file.
*
* @param ruleType rule type
* @return database environment resource file
@@ -75,7 +75,7 @@ public final class EnvironmentPath {
}
/**
- * Get authority resource File.
+ * Get authority resource file.
*
* @param ruleType rule type
* @return authority resource file
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java
index 7b4aa01..db96e45 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/dataset/DataSetEnvironmentManager.java
@@ -19,17 +19,19 @@ package org.apache.shardingsphere.test.integration.env.dataset;
import com.google.common.base.Joiner;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
+import org.apache.shardingsphere.infra.datanode.DataNode;
+import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorServiceManager;
+import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
+import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandlerFactory;
+import org.apache.shardingsphere.sharding.algorithm.sharding.inline.InlineExpressionParser;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValue;
import org.apache.shardingsphere.test.integration.cases.assertion.root.SQLValueGroup;
import org.apache.shardingsphere.test.integration.cases.dataset.DataSet;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetadata;
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.infra.datanode.DataNode;
-import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorServiceManager;
-import org.apache.shardingsphere.sharding.algorithm.sharding.inline.InlineExpressionParser;
import javax.sql.DataSource;
import javax.xml.bind.JAXBContext;
@@ -46,6 +48,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.concurrent.Callable;
/**
@@ -67,18 +70,11 @@ public final class DataSetEnvironmentManager {
}
private static String generateTableName(final String tableName, final DatabaseType databaseType) {
- switch (databaseType.getName()) {
- case "H2":
- case "PostgreSQL":
- case "Oracle":
- return "\"" + tableName + "\"";
- case "MySQL":
- return "`" + tableName + "`";
- case "SQLServer":
- return "[" + tableName + "]";
- default:
- throw new UnsupportedOperationException(String.format("Cannot support database [%s].", databaseType));
+ Optional<DatabaseMetaDataDialectHandler> databaseMetaDataDialectHandler = DatabaseMetaDataDialectHandlerFactory.findHandler(databaseType);
+ if (databaseMetaDataDialectHandler.isPresent()) {
+ return databaseMetaDataDialectHandler.get().getQuoteCharacter().wrap(tableName);
}
+ throw new UnsupportedOperationException(String.format("Cannot support database [%s].", databaseType));
}
/**
@@ -113,7 +109,7 @@ public final class DataSetEnvironmentManager {
}
private Map<DataNode, List<DataSetRow>> getDataSetRowMap() {
- Map<DataNode, List<DataSetRow>> result = new LinkedHashMap<>();
+ Map<DataNode, List<DataSetRow>> result = new LinkedHashMap<>(dataSet.getRows().size(), 1);
for (DataSetRow each : dataSet.getRows()) {
DataNode dataNode = new DataNode(each.getDataNode());
if (!result.containsKey(dataNode)) {