You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2022/02/13 15:26:07 UTC
[shardingsphere] branch master updated: Refactor BaseITCase (#15392)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 527eb2c Refactor BaseITCase (#15392)
527eb2c is described below
commit 527eb2c65d32ebfb940a978bcb21c1275de7feed
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Feb 13 23:25:13 2022 +0800
Refactor BaseITCase (#15392)
* Refactor BaseITCase
* Refactor BaseITCase
* Refactor BaseITCase
* Refactor BaseITCase
* Refactor
---
.../test/integration/engine/BaseITCase.java | 25 +++++-----------------
.../test/integration/engine/dal/GeneralDALIT.java | 3 +--
.../test/integration/engine/dcl/GeneralDCLIT.java | 3 +--
.../test/integration/engine/dql/GeneralDQLIT.java | 3 +--
.../test/integration/engine/ral/GeneralRALIT.java | 3 +--
.../test/integration/engine/rdl/GeneralRDLIT.java | 3 +--
.../test/integration/engine/rql/GeneralRQLIT.java | 3 +--
7 files changed, 11 insertions(+), 32 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 6b6190a..86a5889 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
@@ -19,11 +19,9 @@ package org.apache.shardingsphere.test.integration.engine;
import lombok.AccessLevel;
import lombok.Getter;
-import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
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;
@@ -43,12 +41,10 @@ public abstract class BaseITCase {
public static final String NOT_VERIFY_FLAG = "NOT_VERIFY";
- private final ComposedContainer composedContainer;
+ private final String scenario;
private final String adapter;
- private final String scenario;
-
private final DatabaseType databaseType;
private final SQLCommandType sqlCommandType;
@@ -61,33 +57,22 @@ public abstract class BaseITCase {
public BaseITCase(final ParameterizedArray parameterizedArray) {
adapter = parameterizedArray.getAdapter();
- composedContainer = parameterizedArray.getCompose();
scenario = parameterizedArray.getScenario();
databaseType = parameterizedArray.getDatabaseType();
sqlCommandType = parameterizedArray.getSqlCommandType();
integrationTestCase = parameterizedArray.getTestCaseContext().getTestCase();
- actualDataSourceMap = composedContainer.getActualDataSourceMap();
- targetDataSource = composedContainer.getTargetDataSource();
+ actualDataSourceMap = parameterizedArray.getCompose().getActualDataSourceMap();
+ targetDataSource = parameterizedArray.getCompose().getTargetDataSource();
}
@After
public void tearDown() throws Exception {
// TODO Closing data sources gracefully.
-// if (targetDataSource instanceof ShardingSphereDataSource) {
-// closeDataSource(((ShardingSphereDataSource) targetDataSource));
-// }
-// if (null != dataSourceForReader && dataSourceForReader instanceof ShardingSphereDataSource) {
-// closeDataSource(((ShardingSphereDataSource) dataSourceForReader));
+// if (targetDataSource instanceof AutoCloseable) {
+// ((AutoCloseable) targetDataSource).close();
// }
}
- private void closeDataSource(final ShardingSphereDataSource dataSource) throws Exception {
- try (Connection connection = dataSource.getConnection()) {
- connection.createStatement().execute("SELECT 1");
- }
- dataSource.getContextManager().close();
- }
-
protected abstract String getSQL() throws ParseException;
protected void executeUpdateForStatement(final Connection connection, final String sql) 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 ded6bbf..97a0ca3 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
@@ -22,7 +22,6 @@ 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.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-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;
@@ -48,7 +47,7 @@ public final class GeneralDALIT extends BaseDALIT {
}
@Parameters(name = "{0}")
- public static Collection<ParameterizedArray> getParameters() {
+ public static Collection<AssertionParameterizedArray> getParameters() {
return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DAL)
.stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
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 72766c4..8289485 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
@@ -22,7 +22,6 @@ 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.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-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;
@@ -46,7 +45,7 @@ public final class GeneralDCLIT extends BaseDCLIT {
}
@Parameters(name = "{0}")
- public static Collection<ParameterizedArray> getParameters() {
+ public static Collection<AssertionParameterizedArray> getParameters() {
return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DCL)
.stream()
.peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
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 6cdc146..fd98774 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
@@ -23,7 +23,6 @@ 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.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-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;
@@ -52,7 +51,7 @@ public final class GeneralDQLIT extends BaseDQLIT {
}
@Parameters(name = "{0}")
- public static Collection<ParameterizedArray> getParameters() {
+ public static Collection<AssertionParameterizedArray> getParameters() {
return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL)
.stream()
.peek(each -> each.setCompose(COMPOSED_CONTAINER_MANAGER.getComposedContainer(each)))
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 87e050d..c44f8e7 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
@@ -22,7 +22,6 @@ 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.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-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;
@@ -48,7 +47,7 @@ public final class GeneralRALIT extends BaseRALIT {
}
@Parameters(name = "{0}")
- public static Collection<ParameterizedArray> getParameters() {
+ public static Collection<AssertionParameterizedArray> getParameters() {
return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RAL)
.stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
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 e319892..11d0189 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
@@ -22,7 +22,6 @@ 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.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-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;
@@ -48,7 +47,7 @@ public final class GeneralRDLIT extends BaseRDLIT {
}
@Parameters(name = "{0}")
- public static Collection<ParameterizedArray> getParameters() {
+ public static Collection<AssertionParameterizedArray> getParameters() {
return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RDL)
.stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())
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 dd824c5..f417d3a8 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
@@ -22,7 +22,6 @@ 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.param.ParameterizedArrayFactory;
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
-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;
@@ -48,7 +47,7 @@ public final class GeneralRQLIT extends BaseRQLIT {
}
@Parameters(name = "{0}")
- public static Collection<ParameterizedArray> getParameters() {
+ public static Collection<AssertionParameterizedArray> getParameters() {
return ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.RQL)
.stream()
.filter(each -> SQLExecuteType.Literal == each.getSqlExecuteType())