This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 ca5f9fe4ca0 Refactor TransactionE2EEnvironment (#36713)
ca5f9fe4ca0 is described below
commit ca5f9fe4ca0d221af0e1755ef3e21a566c933bb9
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 26 00:56:47 2025 +0800
Refactor TransactionE2EEnvironment (#36713)
* Refactor TransactionE2EEnvironment
* Refactor TransactionE2EEnvironment
---
.../transaction/engine/base/TransactionBaseE2EIT.java | 12 ++++++------
.../transaction/env/TransactionE2EEnvironment.java | 10 +++++-----
.../transaction/src/test/resources/env/e2e-env.properties | 14 +++++++-------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
index 3fb33cfd408..e3fdf0905c7 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
@@ -391,14 +391,14 @@ public abstract class TransactionBaseE2EIT {
private void setTestParameters(final Map<String,
TransactionTestParameter> testParams, final TransactionTestCaseRegistry
registry, final String databaseVersion,
final TransactionTestCase
transactionTestCase, final String scenario, final Class<? extends
BaseTransactionTestCase> caseClass) {
if (Adapter.PROXY.getValue().equals(registry.getRunningAdaptor()))
{
- List<TransactionType> allowedTransactionTypes =
TRANSACTION_ENV.getAllowTransactionTypes().isEmpty() ?
Arrays.stream(TransactionType.values()).collect(Collectors.toList())
- :
TRANSACTION_ENV.getAllowTransactionTypes().stream().map(TransactionType::valueOf).collect(Collectors.toList());
- List<String> allowedProviders =
TRANSACTION_ENV.getAllowXAProviders().isEmpty() ? ALL_XA_PROVIDERS :
TRANSACTION_ENV.getAllowXAProviders();
- setTestParameters(testParams, registry, databaseVersion,
allowedTransactionTypes, allowedProviders, scenario, caseClass);
+ List<TransactionType> allowedTransactionTypes =
TRANSACTION_ENV.getTransactionTypes().isEmpty() ?
Arrays.stream(TransactionType.values()).collect(Collectors.toList())
+ :
TRANSACTION_ENV.getTransactionTypes().stream().map(TransactionType::valueOf).collect(Collectors.toList());
+ List<String> xaProviders =
TRANSACTION_ENV.getXaProviders().isEmpty() ? ALL_XA_PROVIDERS :
TRANSACTION_ENV.getXaProviders();
+ setTestParameters(testParams, registry, databaseVersion,
allowedTransactionTypes, xaProviders, scenario, caseClass);
return;
}
for (TransactionType each :
transactionTestCase.transactionTypes()) {
- if (!TRANSACTION_ENV.getAllowTransactionTypes().isEmpty() &&
!TRANSACTION_ENV.getAllowTransactionTypes().contains(each.toString())) {
+ if (!TRANSACTION_ENV.getTransactionTypes().isEmpty() &&
!TRANSACTION_ENV.getTransactionTypes().contains(each.toString())) {
log.info("Collect transaction test case, need to run
transaction types don't contain this, skip: {}-{}.", caseClass.getName(), each);
continue;
}
@@ -413,7 +413,7 @@ public abstract class TransactionBaseE2EIT {
return;
}
if (TransactionType.XA == transactionType) {
- for (String each :
TRANSACTION_ENV.getAllowXAProviders().isEmpty() ? ALL_XA_PROVIDERS :
TRANSACTION_ENV.getAllowXAProviders()) {
+ for (String each : TRANSACTION_ENV.getXaProviders().isEmpty()
? ALL_XA_PROVIDERS : TRANSACTION_ENV.getXaProviders()) {
setTestParameters(testParams, registry, databaseVersion,
Collections.singletonList(transactionType), Collections.singletonList(each),
scenario, caseClass);
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
index 02983cfa578..76db1927a01 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
@@ -35,17 +35,17 @@ public final class TransactionE2EEnvironment {
private final Collection<String> cases;
- private final List<String> allowTransactionTypes;
+ private final List<String> transactionTypes;
- private final List<String> allowXAProviders;
+ private final List<String> xaProviders;
private final Map<String, TransactionTestCaseRegistry>
transactionTestCaseRegistryMap;
private TransactionE2EEnvironment() {
Properties props = EnvironmentPropertiesLoader.loadProperties();
- cases = EnvironmentPropertiesLoader.getListValue(props, "e2e.cases");
- allowTransactionTypes =
EnvironmentPropertiesLoader.getListValue(props,
"transaction.e2e.env.transtypes");
- allowXAProviders = EnvironmentPropertiesLoader.getListValue(props,
"transaction.e2e.env.xa.providers");
+ cases = EnvironmentPropertiesLoader.getListValue(props,
"e2e.transaction.cases");
+ transactionTypes = EnvironmentPropertiesLoader.getListValue(props,
"e2e.transaction.types");
+ xaProviders = EnvironmentPropertiesLoader.getListValue(props,
"e2e.transaction.xa.providers");
transactionTestCaseRegistryMap =
Arrays.stream(TransactionTestCaseRegistry.values()).collect(Collectors.toMap(each
-> each.getTestCaseClass().getName(), each -> each));
}
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
index 9b0fa8d6938..df49922aab9 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
@@ -15,18 +15,18 @@
# limitations under the License.
#
-#e2e.cases=ClassicTransferTestCase
-e2e.cases=TransactionDeadlockTestCase, MultiJDBCConnectionsTestCase,
MultiTransactionInConnectionTestCase, MultiOperationsCommitAndRollbackTestCase,
MySQLAutoCommitTestCase, PostgreSQLAutoCommitTestCase,
BroadcastTableTransactionTestCase, ExceptionInTransactionTestCase,
MultiTableCommitAndRollbackTestCase, SingleTableCommitAndRollbackTestCase,
MySQLSetReadOnlyTestCase, MySQLLocalTruncateTestCase, MySQLXATruncateTestCase,
OpenGaussCursorTestCase, NestedTransactionTestCase, ReadwriteSplitt [...]
-
e2e.scenarios=default,cursor,readwrite-splitting
#e2e.run.type=DOCKER,NATIVE
e2e.run.type=
-# transaction.e2e.env.transtypes=LOCAL, XA, BASE
-transaction.e2e.env.transtypes=LOCAL, XA
-# transaction.e2e.env.xa.providers=Atomikos, Narayana
-transaction.e2e.env.xa.providers=Atomikos, Narayana
+#e2e.transaction.cases=ClassicTransferTestCase
+e2e.transaction.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase,
NestedTransactionTestCase, Rea [...]
+
+#e2e.transaction.types=LOCAL,XA,BASE
+e2e.transaction.types=LOCAL,XA
+#e2e.transaction.xa.providers=Atomikos,Narayana
+e2e.transaction.xa.providers=Atomikos,Narayana
#e2e.artifact.proxy.port.bindings=63308:3308
