You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/06 00:50:30 UTC
[shardingsphere] branch master updated: Refactor showprocesslist and transaction's class names (#22684)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 18f30a96dc6 Refactor showprocesslist and transaction's class names (#22684)
18f30a96dc6 is described below
commit 18f30a96dc68f14bfbc8269861bb4ecd87db97b0
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Dec 6 08:50:15 2022 +0800
Refactor showprocesslist and transaction's class names (#22684)
* Refactor pipeline's class names
* Refactor showprocesslist's class names
* Refactor transaction's class names
---
.../ClusterShowProcessListContainerComposer.java | 22 +++---
...rocessListIT.java => ShowProcessListE2EIT.java} | 22 +++---
...onment.java => ShowProcessListEnvironment.java} | 16 ++--
...peEnum.java => ShowProcessListEnvTypeEnum.java} | 2 +-
...ized.java => ShowProcessListTestParameter.java} | 4 +-
.../cases/alterresource/AddResourceTestCase.java | 4 +-
.../cases/alterresource/CloseResourceTestCase.java | 4 +-
.../cases/autocommit/MySQLAutoCommitTestCase.java | 4 +-
.../autocommit/PostgresSQLAutoCommitTestCase.java | 4 +-
.../cases/base/BaseTransactionTestCase.java | 4 +-
.../classictransfer/ClassicTransferTestCase.java | 4 +-
.../BroadcastTableTransactionTestCase.java | 4 +-
.../ExceptionInTransactionTestCase.java | 4 +-
.../MultiOperationsCommitAndRollbackTestCase.java | 4 +-
.../MultiTableCommitAndRollbackTestCase.java | 4 +-
.../SingleTableCommitAndRollbackTestCase.java | 4 +-
.../cases/cursor/OpenGaussCursorTestCase.java | 8 +-
.../cases/nested/NestedTransactionTestCase.java | 4 +-
.../cases/readonly/MySQLSetReadOnlyTestCase.java | 4 +-
.../readonly/PostgreSQLSetReadOnlyTestCase.java | 4 +-
.../cases/readonly/SetReadOnlyTestCase.java | 4 +-
.../cases/savepoint/BaseSavePointTestCase.java | 4 +-
.../cases/savepoint/MySQLSavePointTestCase.java | 4 +-
.../savepoint/OpenGaussSavePointTestCase.java | 4 +-
.../savepoint/PostgreSQLSavePointTestCase.java | 4 +-
.../cases/truncate/MySQLLocalTruncateTestCase.java | 4 +-
.../cases/truncate/MySQLXATruncateTestCase.java | 4 +-
.../PostgresSQLAndOpenGaussTruncateTestCase.java | 4 +-
.../base/{BaseITCase.java => BaseE2EIT.java} | 89 +++++++++++-----------
...actionITCase.java => TransactionBaseE2EIT.java} | 50 ++++++------
.../mysql/MySQLJdbcTransactionE2ETT.java} | 27 +++----
.../mysql/MySQLProxyTransactionE2EIT.java} | 28 +++----
.../opengauss/OpenGaussJdbcTransactionE2EIT.java} | 28 +++----
.../opengauss/OpenGaussProxyTransactionE2EIT.java} | 28 +++----
.../PostgreSQLJdbcTransactionE2EIT.java} | 28 +++----
.../PostgreSQLProxyTransactionE2EIT.java} | 28 +++----
.../postgresql/PostgresqlProxyTransactionIT.java | 64 ----------------
...ronment.java => TransactionE2EEnvironment.java} | 20 ++---
...ypeEnum.java => TransactionE2EEnvTypeEnum.java} | 2 +-
.../env/enums/TransactionTestCaseRegistry.java | 31 ++++----
.../container/compose/DockerContainerComposer.java | 24 +++---
...eterized.java => TransactionTestParameter.java} | 5 +-
42 files changed, 255 insertions(+), 359 deletions(-)
diff --git a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index d43676e51d5..28bfe7f4d0e 100644
--- a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++ b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageCo
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
-import org.apache.shardingsphere.test.e2e.showprocesslist.parameter.ShowProcessListParameterized;
+import org.apache.shardingsphere.test.e2e.showprocesslist.parameter.ShowProcessListTestParameter;
import javax.sql.DataSource;
import java.util.HashMap;
@@ -49,17 +49,17 @@ public final class ClusterShowProcessListContainerComposer {
private final AdapterContainer proxyContainer;
- public ClusterShowProcessListContainerComposer(final ShowProcessListParameterized parameterized) {
- containers = new ITContainers(parameterized.getScenario());
- governanceContainer = isClusterMode(parameterized.getRunMode()) ? containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper")) : null;
- StorageContainer storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(parameterized.getDatabaseType(), "", parameterized.getScenario(),
- StorageContainerConfigurationFactory.newInstance(parameterized.getDatabaseType())));
- AdaptorContainerConfiguration containerConfig = new AdaptorContainerConfiguration(parameterized.getScenario(),
- getMountedResources(parameterized.getScenario(), parameterized.getDatabaseType(), parameterized.getRunMode()), AdapterContainerUtil.getAdapterContainerImage());
- jdbcContainer = AdapterContainerFactory.newInstance(parameterized.getRunMode(), "jdbc", parameterized.getDatabaseType(), storageContainer, parameterized.getScenario(), containerConfig);
- proxyContainer = AdapterContainerFactory.newInstance(parameterized.getRunMode(), "proxy", parameterized.getDatabaseType(), storageContainer, parameterized.getScenario(), containerConfig);
+ public ClusterShowProcessListContainerComposer(final ShowProcessListTestParameter testParameter) {
+ containers = new ITContainers(testParameter.getScenario());
+ governanceContainer = isClusterMode(testParameter.getRunMode()) ? containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper")) : null;
+ StorageContainer storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(testParameter.getDatabaseType(), "", testParameter.getScenario(),
+ StorageContainerConfigurationFactory.newInstance(testParameter.getDatabaseType())));
+ AdaptorContainerConfiguration containerConfig = new AdaptorContainerConfiguration(testParameter.getScenario(),
+ getMountedResources(testParameter.getScenario(), testParameter.getDatabaseType(), testParameter.getRunMode()), AdapterContainerUtil.getAdapterContainerImage());
+ jdbcContainer = AdapterContainerFactory.newInstance(testParameter.getRunMode(), "jdbc", testParameter.getDatabaseType(), storageContainer, testParameter.getScenario(), containerConfig);
+ proxyContainer = AdapterContainerFactory.newInstance(testParameter.getRunMode(), "proxy", testParameter.getDatabaseType(), storageContainer, testParameter.getScenario(), containerConfig);
if (proxyContainer instanceof DockerITContainer) {
- if (isClusterMode(parameterized.getRunMode())) {
+ if (isClusterMode(testParameter.getRunMode())) {
((DockerITContainer) proxyContainer).dependsOn(governanceContainer);
}
((DockerITContainer) proxyContainer).dependsOn(storageContainer);
diff --git a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListIT.java b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
similarity index 87%
rename from test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListIT.java
rename to test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
index b569b7e9502..54cd1af02ac 100644
--- a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListIT.java
+++ b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/engine/ShowProcessListE2EIT.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.e2e.showprocesslist.engine;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.test.e2e.showprocesslist.container.composer.ClusterShowProcessListContainerComposer;
-import org.apache.shardingsphere.test.e2e.showprocesslist.env.enums.ITEnvTypeEnum;
-import org.apache.shardingsphere.test.e2e.showprocesslist.parameter.ShowProcessListParameterized;
-import org.apache.shardingsphere.test.e2e.showprocesslist.env.IntegrationTestEnvironment;
+import org.apache.shardingsphere.test.e2e.showprocesslist.env.enums.ShowProcessListEnvTypeEnum;
+import org.apache.shardingsphere.test.e2e.showprocesslist.parameter.ShowProcessListTestParameter;
+import org.apache.shardingsphere.test.e2e.showprocesslist.env.ShowProcessListEnvironment;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -43,25 +43,25 @@ import static org.hamcrest.MatcherAssert.assertThat;
// TODO add jdbc
@RunWith(Parameterized.class)
-public final class ShowProcessListIT {
+public final class ShowProcessListE2EIT {
- private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
+ private static final ShowProcessListEnvironment ENV = ShowProcessListEnvironment.getInstance();
private static final String SELECT_SLEEP = "select sleep(10)";
private final ClusterShowProcessListContainerComposer containerComposer;
- public ShowProcessListIT(final ShowProcessListParameterized parameterized) {
- containerComposer = new ClusterShowProcessListContainerComposer(parameterized);
+ public ShowProcessListE2EIT(final ShowProcessListTestParameter testParameter) {
+ containerComposer = new ClusterShowProcessListContainerComposer(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<ShowProcessListParameterized> getParameters() {
- Collection<ShowProcessListParameterized> result = new LinkedList<>();
+ public static Collection<ShowProcessListTestParameter> getTestParameters() {
+ Collection<ShowProcessListTestParameter> result = new LinkedList<>();
ENV.getScenarios().forEach(each -> {
- if (ITEnvTypeEnum.DOCKER == ENV.getItEnvType()) {
+ if (ShowProcessListEnvTypeEnum.DOCKER == ENV.getItEnvType()) {
for (String runMode : ENV.getRunModes()) {
- result.add(new ShowProcessListParameterized(new MySQLDatabaseType(), each, runMode));
+ result.add(new ShowProcessListTestParameter(new MySQLDatabaseType(), each, runMode));
}
}
});
diff --git a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/IntegrationTestEnvironment.java b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
similarity index 81%
rename from test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/IntegrationTestEnvironment.java
rename to test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
index 0309054f204..395ab3a7550 100644
--- a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/IntegrationTestEnvironment.java
+++ b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
@@ -21,7 +21,7 @@ import com.google.common.base.Splitter;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
-import org.apache.shardingsphere.test.e2e.showprocesslist.env.enums.ITEnvTypeEnum;
+import org.apache.shardingsphere.test.e2e.showprocesslist.env.enums.ShowProcessListEnvTypeEnum;
import java.io.IOException;
import java.io.InputStream;
@@ -29,22 +29,22 @@ import java.util.Collection;
import java.util.Properties;
@Getter
-public final class IntegrationTestEnvironment {
+public final class ShowProcessListEnvironment {
- private static final IntegrationTestEnvironment INSTANCE = new IntegrationTestEnvironment();
+ private static final ShowProcessListEnvironment INSTANCE = new ShowProcessListEnvironment();
private final Collection<String> runModes;
private final Properties props;
- private final ITEnvTypeEnum itEnvType;
+ private final ShowProcessListEnvTypeEnum itEnvType;
private final Collection<String> scenarios;
- private IntegrationTestEnvironment() {
+ private ShowProcessListEnvironment() {
props = loadProperties();
runModes = Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes"));
- itEnvType = ITEnvTypeEnum.valueOf(props.getProperty("it.env.type", ITEnvTypeEnum.NONE.name()).toUpperCase());
+ itEnvType = ShowProcessListEnvTypeEnum.valueOf(props.getProperty("it.env.type", ShowProcessListEnvTypeEnum.NONE.name()).toUpperCase());
scenarios = getScenarios(props);
}
@@ -53,14 +53,14 @@ public final class IntegrationTestEnvironment {
*
* @return singleton instance
*/
- public static IntegrationTestEnvironment getInstance() {
+ public static ShowProcessListEnvironment getInstance() {
return INSTANCE;
}
@SneakyThrows(IOException.class)
private Properties loadProperties() {
Properties result = new Properties();
- try (InputStream inputStream = IntegrationTestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
+ try (InputStream inputStream = ShowProcessListEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
result.load(inputStream);
}
for (String each : System.getProperties().stringPropertyNames()) {
diff --git a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/enums/ITEnvTypeEnum.java b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/enums/ShowProcessListEnvTypeEnum.java
similarity index 95%
rename from test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/enums/ITEnvTypeEnum.java
rename to test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/enums/ShowProcessListEnvTypeEnum.java
index fb5ad7c08a7..9cc8babd13d 100644
--- a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/enums/ITEnvTypeEnum.java
+++ b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/enums/ShowProcessListEnvTypeEnum.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.showprocesslist.env.enums;
-public enum ITEnvTypeEnum {
+public enum ShowProcessListEnvTypeEnum {
NONE, DOCKER
}
diff --git a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListParameterized.java b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
similarity index 96%
rename from test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListParameterized.java
rename to test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
index 62acca8ddcc..a766d731442 100644
--- a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListParameterized.java
+++ b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/parameter/ShowProcessListTestParameter.java
@@ -22,10 +22,10 @@ import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-@Getter
@RequiredArgsConstructor
+@Getter
@ToString
-public final class ShowProcessListParameterized {
+public final class ShowProcessListTestParameter {
private final DatabaseType databaseType;
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
index 7bf8f3e8f1e..f77dc8f7687 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.alterresource;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
@@ -36,7 +36,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@TransactionTestCase(adapters = AdapterContainerConstants.PROXY, scenario = "addResource")
public final class AddResourceTestCase extends BaseTransactionTestCase {
- public AddResourceTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public AddResourceTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/CloseResourceTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/CloseResourceTestCase.java
index 08066200281..c16ddac1780 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/CloseResourceTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/CloseResourceTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.alterresource;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
@@ -35,7 +35,7 @@ import java.sql.SQLException;
@Slf4j
public final class CloseResourceTestCase extends BaseTransactionTestCase {
- public CloseResourceTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public CloseResourceTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/MySQLAutoCommitTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
index 9a55efe6cd6..b791428d190 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.autocommit;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
@TransactionTestCase(dbTypes = {TransactionTestConstants.MYSQL})
public final class MySQLAutoCommitTestCase extends BaseTransactionTestCase {
- public MySQLAutoCommitTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MySQLAutoCommitTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java
index e1f7537e362..90cfadbd7de 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.autocommit;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
@TransactionTestCase(dbTypes = {TransactionTestConstants.POSTGRESQL})
public final class PostgresSQLAutoCommitTestCase extends BaseTransactionTestCase {
- public PostgresSQLAutoCommitTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public PostgresSQLAutoCommitTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/base/BaseTransactionTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/base/BaseTransactionTestCase.java
index 8065d8f8000..a98f27e292b 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/base/BaseTransactionTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/base/BaseTransactionTestCase.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import javax.sql.DataSource;
@@ -41,7 +41,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@Slf4j
public abstract class BaseTransactionTestCase {
- private final BaseTransactionITCase baseTransactionITCase;
+ private final TransactionBaseE2EIT baseTransactionITCase;
private final DataSource dataSource;
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
index 6d6d18c530e..277c7ae471e 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
@@ -21,7 +21,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import javax.sql.DataSource;
@@ -41,7 +41,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@TransactionTestCase
public final class ClassicTransferTestCase extends BaseTransactionTestCase {
- public ClassicTransferTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public ClassicTransferTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
index 1b02518f4c0..b6d90b0b299 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.commitrollback;
import lombok.SneakyThrows;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import javax.sql.DataSource;
@@ -34,7 +34,7 @@ public final class BroadcastTableTransactionTestCase extends BaseTransactionTest
private static final String T_ADDRESS = "t_address";
- public BroadcastTableTransactionTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public BroadcastTableTransactionTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
index cb55598da67..f6fadd070f5 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.commitrollback;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -38,7 +38,7 @@ import static org.junit.Assert.fail;
@Slf4j
public final class ExceptionInTransactionTestCase extends BaseTransactionTestCase {
- public ExceptionInTransactionTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public ExceptionInTransactionTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiOperationsCommitAndRollbackTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiOperationsCommitAndRollbackTestCase.java
index f2c88f82cba..8fde86ce5ce 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiOperationsCommitAndRollbackTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiOperationsCommitAndRollbackTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.commitrollback;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -38,7 +38,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
@TransactionTestCase
public final class MultiOperationsCommitAndRollbackTestCase extends BaseTransactionTestCase {
- public MultiOperationsCommitAndRollbackTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MultiOperationsCommitAndRollbackTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiTableCommitAndRollbackTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiTableCommitAndRollbackTestCase.java
index 2c59f2213b7..93634fe9e74 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiTableCommitAndRollbackTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/MultiTableCommitAndRollbackTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.commitrollback;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import javax.sql.DataSource;
@@ -35,7 +35,7 @@ public final class MultiTableCommitAndRollbackTestCase extends BaseTransactionTe
private static final String T_ORDER_ITEM = "t_order_item";
- public MultiTableCommitAndRollbackTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MultiTableCommitAndRollbackTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
index 6fd59a5b68c..8fe7258f651 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.commitrollback;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import javax.sql.DataSource;
@@ -32,7 +32,7 @@ import java.sql.Statement;
@TransactionTestCase
public final class SingleTableCommitAndRollbackTestCase extends BaseTransactionTestCase {
- public SingleTableCommitAndRollbackTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public SingleTableCommitAndRollbackTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
index 417806763eb..bf67b2ad052 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.cursor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseITCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.command.CursorSQLCommand;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -46,13 +46,13 @@ public final class OpenGaussCursorTestCase extends BaseTransactionTestCase {
private final CursorSQLCommand cursorSQLCommand;
- public OpenGaussCursorTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public OpenGaussCursorTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
this.cursorSQLCommand = loadCursorSQLCommand();
}
private CursorSQLCommand loadCursorSQLCommand() {
- return JAXB.unmarshal(Objects.requireNonNull(BaseITCase.class.getClassLoader().getResource("env/common/cursor-command.xml")), CursorSQLCommand.class);
+ return JAXB.unmarshal(Objects.requireNonNull(BaseE2EIT.class.getClassLoader().getResource("env/common/cursor-command.xml")), CursorSQLCommand.class);
}
@Override
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/nested/NestedTransactionTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/nested/NestedTransactionTestCase.java
index 14ddb8c71e7..6cdf6512e81 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/nested/NestedTransactionTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/nested/NestedTransactionTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.nested;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
import org.apache.shardingsphere.transaction.api.TransactionType;
@@ -34,7 +34,7 @@ import java.sql.SQLException;
@TransactionTestCase(transactionTypes = TransactionType.LOCAL, adapters = AdapterContainerConstants.JDBC)
public class NestedTransactionTestCase extends BaseTransactionTestCase {
- public NestedTransactionTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public NestedTransactionTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
index 2ec9cc23eb9..7b8d5930948 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.readonly;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -35,7 +35,7 @@ import static org.junit.Assert.fail;
@Slf4j
public final class MySQLSetReadOnlyTestCase extends SetReadOnlyTestCase {
- public MySQLSetReadOnlyTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MySQLSetReadOnlyTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
index c01dfe43d9c..cac86b2047c 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.readonly;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.junit.Assert;
@@ -34,7 +34,7 @@ import java.sql.SQLException;
@Slf4j
public final class PostgreSQLSetReadOnlyTestCase extends SetReadOnlyTestCase {
- public PostgreSQLSetReadOnlyTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public PostgreSQLSetReadOnlyTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
index ddf2ea6a919..35070fa01ca 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.readonly;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
*/
public abstract class SetReadOnlyTestCase extends BaseTransactionTestCase {
- public SetReadOnlyTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public SetReadOnlyTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
index 8ae373512ff..3e6eaa181aa 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.savepoint;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -30,7 +30,7 @@ import java.sql.Savepoint;
*/
public abstract class BaseSavePointTestCase extends BaseTransactionTestCase {
- public BaseSavePointTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public BaseSavePointTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
index 68b0320b875..a399e63aafa 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.savepoint;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -30,7 +30,7 @@ import java.sql.SQLException;
@TransactionTestCase(dbTypes = {TransactionTestConstants.MYSQL})
public final class MySQLSavePointTestCase extends BaseSavePointTestCase {
- public MySQLSavePointTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MySQLSavePointTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
index 6e58fce81a2..4452777d334 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.savepoint;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.opengauss.jdbc.PSQLSavepoint;
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
@TransactionTestCase(dbTypes = {TransactionTestConstants.OPENGAUSS})
public final class OpenGaussSavePointTestCase extends BaseSavePointTestCase {
- public OpenGaussSavePointTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public OpenGaussSavePointTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
index edc55e0b731..9081bc8ea6b 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.savepoint;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.postgresql.jdbc.PSQLSavepoint;
@@ -38,7 +38,7 @@ import static org.junit.Assert.fail;
@TransactionTestCase(dbTypes = {TransactionTestConstants.POSTGRESQL})
public final class PostgreSQLSavePointTestCase extends BaseSavePointTestCase {
- public PostgreSQLSavePointTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public PostgreSQLSavePointTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLLocalTruncateTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLLocalTruncateTestCase.java
index 792e3534244..c51b1521194 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLLocalTruncateTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLLocalTruncateTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.truncate;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.apache.shardingsphere.transaction.api.TransactionType;
@@ -33,7 +33,7 @@ import java.sql.SQLException;
@TransactionTestCase(dbTypes = {TransactionTestConstants.MYSQL}, transactionTypes = {TransactionType.LOCAL})
public final class MySQLLocalTruncateTestCase extends BaseTransactionTestCase {
- public MySQLLocalTruncateTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MySQLLocalTruncateTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
index 8ff5060eb4a..65ca3e7b08a 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.transaction.cases.truncate;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.dialect.exception.transaction.TableModifyInTransactionException;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
@@ -39,7 +39,7 @@ import static org.junit.Assert.fail;
@Slf4j
public final class MySQLXATruncateTestCase extends BaseTransactionTestCase {
- public MySQLXATruncateTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public MySQLXATruncateTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java
index 009a6a82de1..82142b805e4 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.truncate;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
@@ -32,7 +32,7 @@ import java.sql.SQLException;
@TransactionTestCase(dbTypes = {TransactionTestConstants.POSTGRESQL, TransactionTestConstants.OPENGAUSS})
public final class PostgresSQLAndOpenGaussTruncateTestCase extends BaseTransactionTestCase {
- public PostgresSQLAndOpenGaussTruncateTestCase(final BaseTransactionITCase baseTransactionITCase, final DataSource dataSource) {
+ public PostgresSQLAndOpenGaussTruncateTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseITCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
similarity index 80%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseITCase.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
index 22a939cecaa..13710a85e3d 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseITCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
@@ -30,13 +30,13 @@ import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseT
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.command.CommonSQLCommand;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
-import org.apache.shardingsphere.test.e2e.transaction.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionITEnvTypeEnum;
+import org.apache.shardingsphere.test.e2e.transaction.env.TransactionE2EEnvironment;
+import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionE2EEnvTypeEnum;
import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionTestCaseRegistry;
import org.apache.shardingsphere.test.e2e.transaction.framework.container.compose.BaseContainerComposer;
import org.apache.shardingsphere.test.e2e.transaction.framework.container.compose.DockerContainerComposer;
import org.apache.shardingsphere.test.e2e.transaction.framework.container.compose.NativeContainerComposer;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.apache.shardingsphere.test.e2e.transaction.util.TestCaseClassScanner;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
@@ -66,11 +66,11 @@ import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-@Slf4j
@Getter(AccessLevel.PROTECTED)
-public abstract class BaseITCase {
+@Slf4j
+public abstract class BaseE2EIT {
- protected static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
+ protected static final TransactionE2EEnvironment ENV = TransactionE2EEnvironment.getInstance();
protected static final JdbcUrlAppender JDBC_URL_APPENDER = new JdbcUrlAppender();
@@ -95,7 +95,6 @@ public abstract class BaseITCase {
private final String adapter;
- @Getter
private final AutoDataSource dataSource;
static {
@@ -104,28 +103,28 @@ public abstract class BaseITCase {
log.info("Load transaction test case classes time consume: {}.", System.currentTimeMillis() - startTime);
}
- public BaseITCase(final TransactionParameterized parameterized) {
- databaseType = parameterized.getDatabaseType();
- adapter = parameterized.getAdapter();
- containerComposer = initializeContainerComposer(parameterized);
+ public BaseE2EIT(final TransactionTestParameter testParameter) {
+ databaseType = testParameter.getDatabaseType();
+ adapter = testParameter.getAdapter();
+ containerComposer = initializeContainerComposer(testParameter);
commonSQLCommand = loadCommonSQLCommand();
- dataSource = isProxyAdapter(parameterized) ? createProxyDataSource() : createJdbcDataSource();
+ dataSource = isProxyAdapter(testParameter) ? createProxyDataSource() : createJdbcDataSource();
}
- private BaseContainerComposer initializeContainerComposer(final TransactionParameterized parameterized) {
- BaseContainerComposer result = ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER
- ? new DockerContainerComposer(parameterized)
- : new NativeContainerComposer(parameterized.getDatabaseType());
+ private BaseContainerComposer initializeContainerComposer(final TransactionTestParameter testParameter) {
+ BaseContainerComposer result = ENV.getItEnvType() == TransactionE2EEnvTypeEnum.DOCKER
+ ? new DockerContainerComposer(testParameter)
+ : new NativeContainerComposer(testParameter.getDatabaseType());
result.start();
return result;
}
private CommonSQLCommand loadCommonSQLCommand() {
- return JAXB.unmarshal(Objects.requireNonNull(BaseITCase.class.getClassLoader().getResource("env/common/command.xml")), CommonSQLCommand.class);
+ return JAXB.unmarshal(Objects.requireNonNull(BaseE2EIT.class.getClassLoader().getResource("env/common/command.xml")), CommonSQLCommand.class);
}
- final boolean isProxyAdapter(final TransactionParameterized parameterized) {
- return AdapterContainerConstants.PROXY.equalsIgnoreCase(parameterized.getAdapter());
+ final boolean isProxyAdapter(final TransactionTestParameter testParameter) {
+ return AdapterContainerConstants.PROXY.equalsIgnoreCase(testParameter.getAdapter());
}
private ProxyDataSource createProxyDataSource() {
@@ -146,39 +145,39 @@ public abstract class BaseITCase {
storageContainer.getUsername(), storageContainer.getPassword(), 50);
}
- protected static Collection<TransactionParameterized> getTransactionParameterizedList(final Class<? extends BaseTransactionITCase> testCaseClass) {
+ protected static Collection<TransactionTestParameter> getTransactionTestParameters(final Class<? extends TransactionBaseE2EIT> testCaseClass) {
TransactionTestCaseRegistry currentTestCaseInfo = ENV.getTransactionTestCaseRegistryMap().get(testCaseClass.getName());
- Collection<TransactionParameterized> result = new LinkedList<>();
- if (ENV.getItEnvType() == TransactionITEnvTypeEnum.NONE) {
+ Collection<TransactionTestParameter> result = new LinkedList<>();
+ if (ENV.getItEnvType() == TransactionE2EEnvTypeEnum.NONE) {
return result;
}
- if (ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER) {
- addParameters(currentTestCaseInfo, result);
+ if (ENV.getItEnvType() == TransactionE2EEnvTypeEnum.DOCKER) {
+ addTestParameters(currentTestCaseInfo, result);
}
- if (ENV.getItEnvType() == TransactionITEnvTypeEnum.NATIVE && "MySQL".equalsIgnoreCase(ENV.getNativeDatabaseType())) {
+ if (ENV.getItEnvType() == TransactionE2EEnvTypeEnum.NATIVE && "MySQL".equalsIgnoreCase(ENV.getNativeDatabaseType())) {
addParametersByVersions(ENV.getMysqlVersions(), result, currentTestCaseInfo);
}
return result;
}
- private static void addParameters(final TransactionTestCaseRegistry currentTestCaseInfo, final Collection<TransactionParameterized> result) {
+ private static void addTestParameters(final TransactionTestCaseRegistry currentTestCaseInfo, final Collection<TransactionTestParameter> testParameters) {
if (TransactionTestConstants.MYSQL.equalsIgnoreCase(currentTestCaseInfo.getDbType())) {
- addParametersByVersions(ENV.getMysqlVersions(), result, currentTestCaseInfo);
+ addParametersByVersions(ENV.getMysqlVersions(), testParameters, currentTestCaseInfo);
} else if (TransactionTestConstants.POSTGRESQL.equalsIgnoreCase(currentTestCaseInfo.getDbType())) {
- addParametersByVersions(ENV.getPostgresVersions(), result, currentTestCaseInfo);
+ addParametersByVersions(ENV.getPostgresVersions(), testParameters, currentTestCaseInfo);
} else if (TransactionTestConstants.OPENGAUSS.equalsIgnoreCase(currentTestCaseInfo.getDbType())) {
- addParametersByVersions(ENV.getOpenGaussVersions(), result, currentTestCaseInfo);
+ addParametersByVersions(ENV.getOpenGaussVersions(), testParameters, currentTestCaseInfo);
}
}
- private static void addParametersByVersions(final List<String> databaseVersion, final Collection<TransactionParameterized> result, final TransactionTestCaseRegistry currentTestCaseInfo) {
+ private static void addParametersByVersions(final List<String> databaseVersion, final Collection<TransactionTestParameter> testParameters, final TransactionTestCaseRegistry currentTestCaseInfo) {
for (String each : databaseVersion) {
- result.addAll(addParametersByTestCaseClasses(each, currentTestCaseInfo));
+ testParameters.addAll(addParametersByTestCaseClasses(each, currentTestCaseInfo));
}
}
- private static Collection<TransactionParameterized> addParametersByTestCaseClasses(final String version, final TransactionTestCaseRegistry currentTestCaseInfo) {
- Map<String, TransactionParameterized> parameterizedMap = new LinkedHashMap<>();
+ private static Collection<TransactionTestParameter> addParametersByTestCaseClasses(final String version, final TransactionTestCaseRegistry currentTestCaseInfo) {
+ Map<String, TransactionTestParameter> parameterizedMap = new LinkedHashMap<>();
for (Class<? extends BaseTransactionTestCase> each : TEST_CASES) {
if (!ENV.getNeedToRunTestCases().isEmpty() && !ENV.getNeedToRunTestCases().contains(each.getSimpleName())) {
log.info("Collect transaction test case, need to run cases don't contain this, skip: {}.", each.getName());
@@ -207,43 +206,43 @@ public abstract class BaseITCase {
private static void addParametersByTransactionTypes(final String version, final TransactionTestCaseRegistry currentTestCaseInfo,
final Class<? extends BaseTransactionTestCase> caseClass, final TransactionTestCase annotation,
- final Map<String, TransactionParameterized> parameterizedMap, final String scenario) {
+ final Map<String, TransactionTestParameter> testParameters, final String scenario) {
if (AdapterContainerConstants.PROXY.equals(currentTestCaseInfo.getRunningAdaptor())) {
List<TransactionType> allowTransactionTypes = ENV.getAllowTransactionTypes().isEmpty() ? Arrays.stream(TransactionType.values()).collect(Collectors.toList())
: ENV.getAllowTransactionTypes().stream().map(TransactionType::valueOf).collect(Collectors.toList());
List<String> allowProviders = ENV.getAllowXAProviders().isEmpty() ? ALL_XA_PROVIDERS : ENV.getAllowXAProviders();
- addTestParameters(version, currentTestCaseInfo, caseClass, allowTransactionTypes, allowProviders, parameterizedMap, scenario);
+ addParameters(version, currentTestCaseInfo, caseClass, allowTransactionTypes, allowProviders, testParameters, scenario);
} else {
for (TransactionType each : annotation.transactionTypes()) {
if (!ENV.getAllowTransactionTypes().isEmpty() && !ENV.getAllowTransactionTypes().contains(each.toString())) {
log.info("Collect transaction test case, need to run transaction types don't contain this, skip: {}-{}.", caseClass.getName(), each);
continue;
}
- addParametersByTransactionProvidersInJDBC(version, currentTestCaseInfo, caseClass, each, parameterizedMap, scenario);
+ addParametersByTransactionProvidersInJDBC(version, currentTestCaseInfo, caseClass, each, testParameters, scenario);
}
}
}
private static void addParametersByTransactionProvidersInJDBC(final String version, final TransactionTestCaseRegistry currentTestCaseInfo,
final Class<? extends BaseTransactionTestCase> caseClass, final TransactionType each,
- final Map<String, TransactionParameterized> parameterizedMap, final String scenario) {
+ final Map<String, TransactionTestParameter> testParameters, final String scenario) {
if (TransactionType.LOCAL.equals(each)) {
- addTestParameters(version, currentTestCaseInfo, caseClass, Collections.singletonList(each), Collections.singletonList(""), parameterizedMap, scenario);
+ addParameters(version, currentTestCaseInfo, caseClass, Collections.singletonList(each), Collections.singletonList(""), testParameters, scenario);
} else if (TransactionType.XA.equals(each)) {
List<String> allowProviders = ENV.getAllowXAProviders().isEmpty() ? ALL_XA_PROVIDERS : ENV.getAllowXAProviders();
for (String provider : allowProviders) {
- addTestParameters(version, currentTestCaseInfo, caseClass, Collections.singletonList(each), Collections.singletonList(provider), parameterizedMap, scenario);
+ addParameters(version, currentTestCaseInfo, caseClass, Collections.singletonList(each), Collections.singletonList(provider), testParameters, scenario);
}
}
}
- private static void addTestParameters(final String version, final TransactionTestCaseRegistry currentTestCaseInfo,
- final Class<? extends BaseTransactionTestCase> caseClass, final List<TransactionType> transactionTypes, final List<String> providers,
- final Map<String, TransactionParameterized> parameterizedMap, final String scenario) {
+ private static void addParameters(final String version, final TransactionTestCaseRegistry currentTestCaseInfo,
+ final Class<? extends BaseTransactionTestCase> caseClass, final List<TransactionType> transactionTypes, final List<String> providers,
+ final Map<String, TransactionTestParameter> testParameters, final String scenario) {
String uniqueKey = getUniqueKey(currentTestCaseInfo.getDbType(), currentTestCaseInfo.getRunningAdaptor(), transactionTypes, providers, scenario);
- parameterizedMap.putIfAbsent(uniqueKey, new TransactionParameterized(getSqlDatabaseType(currentTestCaseInfo.getDbType()), currentTestCaseInfo.getRunningAdaptor(), transactionTypes, providers,
+ testParameters.putIfAbsent(uniqueKey, new TransactionTestParameter(getSqlDatabaseType(currentTestCaseInfo.getDbType()), currentTestCaseInfo.getRunningAdaptor(), transactionTypes, providers,
getStorageContainerImage(currentTestCaseInfo.getDbType(), version), scenario, new LinkedList<>()));
- parameterizedMap.get(uniqueKey).getTransactionTestCaseClasses().add(caseClass);
+ testParameters.get(uniqueKey).getTransactionTestCaseClasses().add(caseClass);
}
private static String getUniqueKey(final String dbType, final String runningAdapter, final List<TransactionType> transactionTypes, final List<String> providers, final String scenario) {
@@ -280,7 +279,7 @@ public abstract class BaseITCase {
}
private String getActualJdbcUrlTemplate(final String databaseName) {
- if (ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER) {
+ if (ENV.getItEnvType() == TransactionE2EEnvTypeEnum.DOCKER) {
DockerStorageContainer storageContainer = ((DockerContainerComposer) containerComposer).getStorageContainer();
return DataSourceEnvironment.getURL(getDatabaseType(), getDatabaseType().getType().toLowerCase() + ".host", storageContainer.getExposedPort(), databaseName);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseTransactionITCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
similarity index 78%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseTransactionITCase.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index 93a2cdff576..fde9c40fcb5 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseTransactionITCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
import org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
import org.apache.shardingsphere.transaction.api.TransactionType;
@@ -39,10 +39,10 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertTrue;
@Slf4j
-public abstract class BaseTransactionITCase extends BaseITCase {
+public abstract class TransactionBaseE2EIT extends BaseE2EIT {
- public BaseTransactionITCase(final TransactionParameterized parameterized) {
- super(parameterized);
+ public TransactionBaseE2EIT(final TransactionTestParameter testParameter) {
+ super(testParameter);
}
/**
@@ -119,23 +119,23 @@ public abstract class BaseTransactionITCase extends BaseITCase {
return result;
}
- protected void callTestCases(final TransactionParameterized parameterized) throws SQLException {
- if (AdapterContainerConstants.PROXY.equalsIgnoreCase(parameterized.getAdapter())) {
- for (TransactionType each : parameterized.getTransactionTypes()) {
+ protected void callTestCases(final TransactionTestParameter testParameter) throws SQLException {
+ if (AdapterContainerConstants.PROXY.equalsIgnoreCase(testParameter.getAdapter())) {
+ for (TransactionType each : testParameter.getTransactionTypes()) {
if (TransactionType.LOCAL.equals(each)) {
- log.info("Call transaction IT {}, alter transaction rule {}.", parameterized, "");
+ log.info("Call transaction IT {}, alter transaction rule {}.", testParameter, "");
alterTransactionRule(each, "");
- doCallTestCases(parameterized, each, "");
+ doCallTestCases(testParameter, each, "");
} else if (TransactionType.XA.equals(each)) {
- for (String eachProvider : parameterized.getProviders()) {
- log.info("Call transaction IT {}, alter transaction rule {}.", parameterized, eachProvider);
+ for (String eachProvider : testParameter.getProviders()) {
+ log.info("Call transaction IT {}, alter transaction rule {}.", testParameter, eachProvider);
alterTransactionRule(each, eachProvider);
- doCallTestCases(parameterized, each, eachProvider);
+ doCallTestCases(testParameter, each, eachProvider);
}
}
}
} else {
- doCallTestCases(parameterized);
+ doCallTestCases(testParameter);
}
}
@@ -147,18 +147,18 @@ public abstract class BaseTransactionITCase extends BaseITCase {
}
}
- private void doCallTestCases(final TransactionParameterized parameterized) {
- for (Class<? extends BaseTransactionTestCase> each : parameterized.getTransactionTestCaseClasses()) {
- log.info("Transaction IT {} -> {} test begin.", parameterized, each.getSimpleName());
+ private void doCallTestCases(final TransactionTestParameter testParameter) {
+ for (Class<? extends BaseTransactionTestCase> each : testParameter.getTransactionTestCaseClasses()) {
+ log.info("Transaction IT {} -> {} test begin.", testParameter, each.getSimpleName());
try {
- each.getConstructor(BaseTransactionITCase.class, DataSource.class).newInstance(this, getDataSource()).execute();
+ each.getConstructor(TransactionBaseE2EIT.class, DataSource.class).newInstance(this, getDataSource()).execute();
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- log.error(String.format("Transaction IT %s -> %s test failed", parameterized, each.getSimpleName()), ex);
+ log.error(String.format("Transaction IT %s -> %s test failed", testParameter, each.getSimpleName()), ex);
throw new RuntimeException(ex);
}
- log.info("Transaction IT {} -> {} test end.", parameterized, each.getSimpleName());
+ log.info("Transaction IT {} -> {} test end.", testParameter, each.getSimpleName());
try {
getDataSource().close();
} catch (final SQLException ignored) {
@@ -166,21 +166,21 @@ public abstract class BaseTransactionITCase extends BaseITCase {
}
}
- private void doCallTestCases(final TransactionParameterized parameterized, final TransactionType transactionType, final String provider) {
- for (Class<? extends BaseTransactionTestCase> each : parameterized.getTransactionTestCaseClasses()) {
+ private void doCallTestCases(final TransactionTestParameter testParameter, final TransactionType transactionType, final String provider) {
+ for (Class<? extends BaseTransactionTestCase> each : testParameter.getTransactionTestCaseClasses()) {
if (!Arrays.asList(each.getAnnotation(TransactionTestCase.class).transactionTypes()).contains(transactionType)) {
return;
}
- log.info("Call transaction IT {} -> {} -> {} -> {} test begin.", parameterized, transactionType, provider, each.getSimpleName());
+ log.info("Call transaction IT {} -> {} -> {} -> {} test begin.", testParameter, transactionType, provider, each.getSimpleName());
try {
- each.getConstructor(BaseTransactionITCase.class, DataSource.class).newInstance(this, getDataSource()).execute();
+ each.getConstructor(TransactionBaseE2EIT.class, DataSource.class).newInstance(this, getDataSource()).execute();
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- log.error(String.format("Transaction IT %s -> %s test failed", parameterized, each.getSimpleName()), ex);
+ log.error(String.format("Transaction IT %s -> %s test failed", testParameter, each.getSimpleName()), ex);
throw new RuntimeException(ex);
}
- log.info("Call transaction IT {} -> {} -> {} -> {} test end.", parameterized, transactionType, provider, each.getSimpleName());
+ log.info("Call transaction IT {} -> {} -> {} -> {} test end.", testParameter, transactionType, provider, each.getSimpleName());
try {
getDataSource().close();
} catch (final SQLException ignored) {
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlJdbcTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/mysql/MySQLJdbcTransactionE2ETT.java
similarity index 66%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlJdbcTransactionIT.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/mysql/MySQLJdbcTransactionE2ETT.java
index 82e7092031c..86fb13a3d7d 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlJdbcTransactionIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/mysql/MySQLJdbcTransactionE2ETT.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.transaction.engine.mysql;
+package org.apache.shardingsphere.test.e2e.transaction.engine.database.mysql;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,24 +29,21 @@ import org.junit.runners.Parameterized.Parameters;
import java.sql.SQLException;
import java.util.Collection;
-/**
- * MySQL general transaction test case with JDBC container, includes multiple cases.
- */
@RunWith(Parameterized.class)
@Slf4j
-public final class MysqlJdbcTransactionIT extends BaseTransactionITCase {
+public final class MySQLJdbcTransactionE2ETT extends TransactionBaseE2EIT {
- private final TransactionParameterized parameterized;
+ private final TransactionTestParameter testParameter;
- public MysqlJdbcTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
+ public MySQLJdbcTransactionE2ETT(final TransactionTestParameter testParameter) {
+ super(testParameter);
+ this.testParameter = testParameter;
+ log.info("Parameterized:{}", testParameter);
}
@Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(MysqlJdbcTransactionIT.class);
+ public static Collection<TransactionTestParameter> getTestParameters() {
+ return getTransactionTestParameters(MySQLJdbcTransactionE2ETT.class);
}
@After
@@ -57,6 +54,6 @@ public final class MysqlJdbcTransactionIT extends BaseTransactionITCase {
@Test
public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
+ callTestCases(testParameter);
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlProxyTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/mysql/MySQLProxyTransactionE2EIT.java
similarity index 65%
copy from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlProxyTransactionIT.java
copy to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/mysql/MySQLProxyTransactionE2EIT.java
index 80ba406fa0f..bfabcbaff48 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlProxyTransactionIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/mysql/MySQLProxyTransactionE2EIT.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.transaction.engine.mysql;
+package org.apache.shardingsphere.test.e2e.transaction.engine.database.mysql;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,24 +29,19 @@ import org.junit.runners.Parameterized.Parameters;
import java.sql.SQLException;
import java.util.Collection;
-/**
- * MySQL general transaction test case with proxy container, includes multiple cases.
- */
-@Slf4j
@RunWith(Parameterized.class)
-public final class MysqlProxyTransactionIT extends BaseTransactionITCase {
+public final class MySQLProxyTransactionE2EIT extends TransactionBaseE2EIT {
- private final TransactionParameterized parameterized;
+ private final TransactionTestParameter testParameter;
- public MysqlProxyTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
+ public MySQLProxyTransactionE2EIT(final TransactionTestParameter testParameter) {
+ super(testParameter);
+ this.testParameter = testParameter;
}
@Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(MysqlProxyTransactionIT.class);
+ public static Collection<TransactionTestParameter> getTestParameters() {
+ return getTransactionTestParameters(MySQLProxyTransactionE2EIT.class);
}
@After
@@ -59,6 +53,6 @@ public final class MysqlProxyTransactionIT extends BaseTransactionITCase {
@Test
public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
+ callTestCases(testParameter);
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/opengauss/OpenGaussJdbcTransactionE2EIT.java
similarity index 65%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/opengauss/OpenGaussJdbcTransactionE2EIT.java
index ef71ec1f068..4dcdd8ef04d 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/opengauss/OpenGaussJdbcTransactionE2EIT.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.transaction.engine.opengauss;
+package org.apache.shardingsphere.test.e2e.transaction.engine.database.opengauss;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,24 +29,19 @@ import org.junit.runners.Parameterized.Parameters;
import java.sql.SQLException;
import java.util.Collection;
-/**
- * OpenGauss general transaction test case with JDBC container, includes multiple cases.
- */
-@Slf4j
@RunWith(Parameterized.class)
-public final class OpenGaussJdbcTransactionIT extends BaseTransactionITCase {
+public final class OpenGaussJdbcTransactionE2EIT extends TransactionBaseE2EIT {
- private final TransactionParameterized parameterized;
+ private final TransactionTestParameter testParameter;
- public OpenGaussJdbcTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
+ public OpenGaussJdbcTransactionE2EIT(final TransactionTestParameter testParameter) {
+ super(testParameter);
+ this.testParameter = testParameter;
}
@Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(OpenGaussJdbcTransactionIT.class);
+ public static Collection<TransactionTestParameter> getTestParameters() {
+ return getTransactionTestParameters(OpenGaussJdbcTransactionE2EIT.class);
}
@After
@@ -59,6 +53,6 @@ public final class OpenGaussJdbcTransactionIT extends BaseTransactionITCase {
@Test
public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
+ callTestCases(testParameter);
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/opengauss/OpenGaussProxyTransactionE2EIT.java
similarity index 65%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/opengauss/OpenGaussProxyTransactionE2EIT.java
index cbcb5d97084..56c89e1b85f 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/opengauss/OpenGaussProxyTransactionE2EIT.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.transaction.engine.opengauss;
+package org.apache.shardingsphere.test.e2e.transaction.engine.database.opengauss;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,24 +29,19 @@ import org.junit.runners.Parameterized.Parameters;
import java.sql.SQLException;
import java.util.Collection;
-/**
- * OpenGauss general transaction test case with proxy container, includes multiple cases.
- */
-@Slf4j
@RunWith(Parameterized.class)
-public final class OpenGaussProxyTransactionIT extends BaseTransactionITCase {
+public final class OpenGaussProxyTransactionE2EIT extends TransactionBaseE2EIT {
- private final TransactionParameterized parameterized;
+ private final TransactionTestParameter testParameter;
- public OpenGaussProxyTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
+ public OpenGaussProxyTransactionE2EIT(final TransactionTestParameter testParameter) {
+ super(testParameter);
+ this.testParameter = testParameter;
}
@Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(OpenGaussProxyTransactionIT.class);
+ public static Collection<TransactionTestParameter> getTestParameters() {
+ return getTransactionTestParameters(OpenGaussProxyTransactionE2EIT.class);
}
@After
@@ -59,6 +53,6 @@ public final class OpenGaussProxyTransactionIT extends BaseTransactionITCase {
@Test
public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
+ callTestCases(testParameter);
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/postgresql/PostgresqlJdbcTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/postgresql/PostgreSQLJdbcTransactionE2EIT.java
similarity index 65%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/postgresql/PostgresqlJdbcTransactionIT.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/postgresql/PostgreSQLJdbcTransactionE2EIT.java
index c3b5eb258b2..57354e5ff87 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/postgresql/PostgresqlJdbcTransactionIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/postgresql/PostgreSQLJdbcTransactionE2EIT.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.transaction.engine.postgresql;
+package org.apache.shardingsphere.test.e2e.transaction.engine.database.postgresql;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,24 +29,19 @@ import org.junit.runners.Parameterized.Parameters;
import java.sql.SQLException;
import java.util.Collection;
-/**
- * PostgreSQL general transaction test case with JDBC container, includes multiple cases.
- */
-@Slf4j
@RunWith(Parameterized.class)
-public final class PostgresqlJdbcTransactionIT extends BaseTransactionITCase {
+public final class PostgreSQLJdbcTransactionE2EIT extends TransactionBaseE2EIT {
- private final TransactionParameterized parameterized;
+ private final TransactionTestParameter testParameter;
- public PostgresqlJdbcTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
+ public PostgreSQLJdbcTransactionE2EIT(final TransactionTestParameter testParameter) {
+ super(testParameter);
+ this.testParameter = testParameter;
}
@Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(PostgresqlJdbcTransactionIT.class);
+ public static Collection<TransactionTestParameter> getTestParameters() {
+ return getTransactionTestParameters(PostgreSQLJdbcTransactionE2EIT.class);
}
@After
@@ -59,6 +53,6 @@ public final class PostgresqlJdbcTransactionIT extends BaseTransactionITCase {
@Test
public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
+ callTestCases(testParameter);
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlProxyTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/postgresql/PostgreSQLProxyTransactionE2EIT.java
similarity index 65%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlProxyTransactionIT.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/postgresql/PostgreSQLProxyTransactionE2EIT.java
index 80ba406fa0f..0ad5ab2f3a4 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/mysql/MysqlProxyTransactionIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/database/postgresql/PostgreSQLProxyTransactionE2EIT.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.transaction.engine.mysql;
+package org.apache.shardingsphere.test.e2e.transaction.engine.database.postgresql;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,24 +29,19 @@ import org.junit.runners.Parameterized.Parameters;
import java.sql.SQLException;
import java.util.Collection;
-/**
- * MySQL general transaction test case with proxy container, includes multiple cases.
- */
-@Slf4j
@RunWith(Parameterized.class)
-public final class MysqlProxyTransactionIT extends BaseTransactionITCase {
+public final class PostgreSQLProxyTransactionE2EIT extends TransactionBaseE2EIT {
- private final TransactionParameterized parameterized;
+ private final TransactionTestParameter testParameter;
- public MysqlProxyTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
+ public PostgreSQLProxyTransactionE2EIT(final TransactionTestParameter testParameter) {
+ super(testParameter);
+ this.testParameter = testParameter;
}
@Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(MysqlProxyTransactionIT.class);
+ public static Collection<TransactionTestParameter> getTestParameters() {
+ return getTransactionTestParameters(PostgreSQLProxyTransactionE2EIT.class);
}
@After
@@ -59,6 +53,6 @@ public final class MysqlProxyTransactionIT extends BaseTransactionITCase {
@Test
public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
+ callTestCases(testParameter);
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/postgresql/PostgresqlProxyTransactionIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/postgresql/PostgresqlProxyTransactionIT.java
deleted file mode 100644
index 97410b6c006..00000000000
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/postgresql/PostgresqlProxyTransactionIT.java
+++ /dev/null
@@ -1,64 +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.e2e.transaction.engine.postgresql;
-
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import java.sql.SQLException;
-import java.util.Collection;
-
-/**
- * PostgreSQL general transaction test case with proxy container, includes multiple cases.
- */
-@Slf4j
-@RunWith(Parameterized.class)
-public final class PostgresqlProxyTransactionIT extends BaseTransactionITCase {
-
- private final TransactionParameterized parameterized;
-
- public PostgresqlProxyTransactionIT(final TransactionParameterized parameterized) {
- super(parameterized);
- this.parameterized = parameterized;
- log.info("Parameterized:{}", parameterized);
- }
-
- @Parameters(name = "{0}")
- public static Collection<TransactionParameterized> getParameters() {
- return getTransactionParameterizedList(PostgresqlProxyTransactionIT.class);
- }
-
- @After
- @SneakyThrows(SQLException.class)
- public void after() {
- getDataSource().close();
- getContainerComposer().close();
- }
-
- @Test
- public void assertTransaction() throws SQLException {
- callTestCases(parameterized);
- }
-}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/IntegrationTestEnvironment.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
similarity index 90%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/IntegrationTestEnvironment.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
index e24218f503d..15edbc8c9ef 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/IntegrationTestEnvironment.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
@@ -21,7 +21,7 @@ import com.google.common.base.Strings;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionITEnvTypeEnum;
+import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionE2EEnvTypeEnum;
import org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionTestCaseRegistry;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
@@ -37,13 +37,13 @@ import java.util.stream.Collectors;
@Getter
@Slf4j
-public final class IntegrationTestEnvironment {
+public final class TransactionE2EEnvironment {
- private static final IntegrationTestEnvironment INSTANCE = new IntegrationTestEnvironment();
+ private static final TransactionE2EEnvironment INSTANCE = new TransactionE2EEnvironment();
private final Properties props;
- private final TransactionITEnvTypeEnum itEnvType;
+ private final TransactionE2EEnvTypeEnum itEnvType;
private final List<String> mysqlVersions;
@@ -59,9 +59,9 @@ public final class IntegrationTestEnvironment {
private final Map<String, TransactionTestCaseRegistry> transactionTestCaseRegistryMap;
- private IntegrationTestEnvironment() {
+ private TransactionE2EEnvironment() {
props = loadProperties();
- itEnvType = TransactionITEnvTypeEnum.valueOf(props.getProperty("transaction.it.env.type", TransactionITEnvTypeEnum.NONE.name()).toUpperCase());
+ itEnvType = TransactionE2EEnvTypeEnum.valueOf(props.getProperty("transaction.it.env.type", TransactionE2EEnvTypeEnum.NONE.name()).toUpperCase());
mysqlVersions = splitProperty("transaction.it.docker.mysql.version");
postgresVersions = splitProperty("transaction.it.docker.postgresql.version");
openGaussVersions = splitProperty("transaction.it.docker.opengauss.version");
@@ -87,7 +87,7 @@ public final class IntegrationTestEnvironment {
private Properties loadProperties() {
Properties result = new Properties();
- try (InputStream inputStream = IntegrationTestEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
+ try (InputStream inputStream = TransactionE2EEnvironment.class.getClassLoader().getResourceAsStream("env/it-env.properties")) {
result.load(inputStream);
} catch (final IOException ex) {
throw new RuntimeException(ex);
@@ -133,7 +133,7 @@ public final class IntegrationTestEnvironment {
* @return actual data source username
*/
public String getActualDataSourceUsername(final DatabaseType databaseType) {
- return itEnvType == TransactionITEnvTypeEnum.NATIVE
+ return itEnvType == TransactionE2EEnvTypeEnum.NATIVE
? String.valueOf(props.getOrDefault(String.format("transaction.it.native.%s.username", databaseType.getType().toLowerCase()), ProxyContainerConstants.USERNAME))
: StorageContainerConstants.USERNAME;
}
@@ -145,7 +145,7 @@ public final class IntegrationTestEnvironment {
* @return actual data source username
*/
public String getActualDataSourcePassword(final DatabaseType databaseType) {
- return itEnvType == TransactionITEnvTypeEnum.NATIVE
+ return itEnvType == TransactionE2EEnvTypeEnum.NATIVE
? props.getOrDefault(String.format("transaction.it.native.%s.password", databaseType.getType().toLowerCase()), ProxyContainerConstants.PASSWORD).toString()
: StorageContainerConstants.PASSWORD;
}
@@ -175,7 +175,7 @@ public final class IntegrationTestEnvironment {
*
* @return singleton instance
*/
- public static IntegrationTestEnvironment getInstance() {
+ public static TransactionE2EEnvironment getInstance() {
return INSTANCE;
}
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionITEnvTypeEnum.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionE2EEnvTypeEnum.java
similarity index 95%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionITEnvTypeEnum.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionE2EEnvTypeEnum.java
index acec4aaaaf5..7dad63d6f82 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionITEnvTypeEnum.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionE2EEnvTypeEnum.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.transaction.env.enums;
-public enum TransactionITEnvTypeEnum {
+public enum TransactionE2EEnvTypeEnum {
NONE, DOCKER, NATIVE
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
index 87a60e01c92..13d7b837627 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
@@ -19,36 +19,33 @@ package org.apache.shardingsphere.test.e2e.transaction.env.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.transaction.engine.base.BaseTransactionITCase;
+import org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
-import org.apache.shardingsphere.test.e2e.transaction.engine.mysql.MysqlJdbcTransactionIT;
-import org.apache.shardingsphere.test.e2e.transaction.engine.mysql.MysqlProxyTransactionIT;
-import org.apache.shardingsphere.test.e2e.transaction.engine.opengauss.OpenGaussJdbcTransactionIT;
-import org.apache.shardingsphere.test.e2e.transaction.engine.opengauss.OpenGaussProxyTransactionIT;
-import org.apache.shardingsphere.test.e2e.transaction.engine.postgresql.PostgresqlJdbcTransactionIT;
-import org.apache.shardingsphere.test.e2e.transaction.engine.postgresql.PostgresqlProxyTransactionIT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.database.mysql.MySQLJdbcTransactionE2ETT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.database.mysql.MySQLProxyTransactionE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.database.opengauss.OpenGaussJdbcTransactionE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.database.opengauss.OpenGaussProxyTransactionE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.database.postgresql.PostgreSQLJdbcTransactionE2EIT;
+import org.apache.shardingsphere.test.e2e.transaction.engine.database.postgresql.PostgreSQLProxyTransactionE2EIT;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
-/**
- * Transaction test case registry.
- */
@RequiredArgsConstructor
@Getter
public enum TransactionTestCaseRegistry {
- MySQL_JDBC_IT(MysqlJdbcTransactionIT.class, TransactionTestConstants.MYSQL, AdapterContainerConstants.JDBC),
+ MySQL_JDBC_IT(MySQLJdbcTransactionE2ETT.class, TransactionTestConstants.MYSQL, AdapterContainerConstants.JDBC),
- MySQL_PROXY_IT(MysqlProxyTransactionIT.class, TransactionTestConstants.MYSQL, AdapterContainerConstants.PROXY),
+ MySQL_PROXY_IT(MySQLProxyTransactionE2EIT.class, TransactionTestConstants.MYSQL, AdapterContainerConstants.PROXY),
- OPENGAUSS_JDBC_IT(OpenGaussJdbcTransactionIT.class, TransactionTestConstants.OPENGAUSS, AdapterContainerConstants.JDBC),
+ OPENGAUSS_JDBC_IT(OpenGaussJdbcTransactionE2EIT.class, TransactionTestConstants.OPENGAUSS, AdapterContainerConstants.JDBC),
- OPENGAUSS_PROXY_IT(OpenGaussProxyTransactionIT.class, TransactionTestConstants.OPENGAUSS, AdapterContainerConstants.PROXY),
+ OPENGAUSS_PROXY_IT(OpenGaussProxyTransactionE2EIT.class, TransactionTestConstants.OPENGAUSS, AdapterContainerConstants.PROXY),
- POSTGRESQL_JDBC_IT(PostgresqlJdbcTransactionIT.class, TransactionTestConstants.POSTGRESQL, AdapterContainerConstants.JDBC),
+ POSTGRESQL_JDBC_IT(PostgreSQLJdbcTransactionE2EIT.class, TransactionTestConstants.POSTGRESQL, AdapterContainerConstants.JDBC),
- POSTGRESQL_PROXY_IT(PostgresqlProxyTransactionIT.class, TransactionTestConstants.POSTGRESQL, AdapterContainerConstants.PROXY);
+ POSTGRESQL_PROXY_IT(PostgreSQLProxyTransactionE2EIT.class, TransactionTestConstants.POSTGRESQL, AdapterContainerConstants.PROXY);
- private final Class<? extends BaseTransactionITCase> testCaseClass;
+ private final Class<? extends TransactionBaseE2EIT> testCaseClass;
private final String dbType;
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
index 5e4158cfd95..131a01988cd 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.e2e.transaction.framework.container.config.StorageContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.transaction.framework.container.config.proxy.ProxyClusterContainerConfigurationFactory;
import org.apache.shardingsphere.test.e2e.transaction.framework.container.jdbc.ShardingSphereJDBCContainer;
-import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionParameterized;
+import org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.AdapterContainerConstants;
@@ -54,31 +54,31 @@ public final class DockerContainerComposer extends BaseContainerComposer {
private final DockerStorageContainer storageContainer;
- public DockerContainerComposer(final TransactionParameterized parameterized) {
- super(parameterized.getScenario());
- this.databaseType = parameterized.getDatabaseType();
+ public DockerContainerComposer(final TransactionTestParameter testParameter) {
+ super(testParameter.getScenario());
+ this.databaseType = testParameter.getDatabaseType();
governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
storageContainer =
- getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, parameterized.getStorageContainerImage(), parameterized.getScenario(),
+ getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, testParameter.getStorageContainerImage(), testParameter.getScenario(),
StorageContainerConfigurationFactory.newInstance(databaseType)));
- if (AdapterContainerConstants.PROXY.equalsIgnoreCase(parameterized.getAdapter())) {
+ if (AdapterContainerConstants.PROXY.equalsIgnoreCase(testParameter.getAdapter())) {
jdbcContainer = null;
proxyContainer = (ShardingSphereProxyClusterContainer) AdapterContainerFactory.newInstance(EnvironmentConstants.CLUSTER_MODE, AdapterContainerConstants.PROXY,
- databaseType, storageContainer, parameterized.getScenario(), ProxyClusterContainerConfigurationFactory.newInstance(parameterized.getScenario(), databaseType));
+ databaseType, storageContainer, testParameter.getScenario(), ProxyClusterContainerConfigurationFactory.newInstance(testParameter.getScenario(), databaseType));
proxyContainer.dependsOn(governanceContainer, storageContainer);
getContainers().registerContainer(proxyContainer);
} else {
proxyContainer = null;
ShardingSphereJDBCContainer jdbcContainer = new ShardingSphereJDBCContainer(storageContainer,
- Objects.requireNonNull(ShardingSphereJDBCContainer.class.getClassLoader().getResource(getShardingSphereConfigResource(parameterized))).getFile());
+ Objects.requireNonNull(ShardingSphereJDBCContainer.class.getClassLoader().getResource(getShardingSphereConfigResource(testParameter))).getFile());
this.jdbcContainer = getContainers().registerContainer(jdbcContainer);
}
}
- private String getShardingSphereConfigResource(final TransactionParameterized parameterized) {
- String result = String.format("env/%s/%s/config-sharding-%s%s.yaml", parameterized.getAdapter().toLowerCase(),
- parameterized.getDatabaseType().getType().toLowerCase(), parameterized.getTransactionTypes().get(0).toString().toLowerCase(),
- getTransactionProvider(parameterized.getProviders().get(0)));
+ private String getShardingSphereConfigResource(final TransactionTestParameter testParameter) {
+ String result = String.format("env/%s/%s/config-sharding-%s%s.yaml", testParameter.getAdapter().toLowerCase(),
+ testParameter.getDatabaseType().getType().toLowerCase(), testParameter.getTransactionTypes().get(0).toString().toLowerCase(),
+ getTransactionProvider(testParameter.getProviders().get(0)));
log.info("Transaction IT tests use the configuration file: {}", result);
return result;
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/param/TransactionParameterized.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/param/TransactionTestParameter.java
similarity index 95%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/param/TransactionParameterized.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/param/TransactionTestParameter.java
index aabf3690090..b6677ba3551 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/param/TransactionParameterized.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/param/TransactionTestParameter.java
@@ -26,12 +26,9 @@ import org.apache.shardingsphere.transaction.api.TransactionType;
import java.util.Collection;
import java.util.List;
-/**
- * Transaction test parameters.
- */
@RequiredArgsConstructor
@Getter
-public final class TransactionParameterized {
+public final class TransactionTestParameter {
private final DatabaseType databaseType;