(shardingsphere) branch master updated: Fix mysql truncate E2E (#31804)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 fa0aefed5be Fix mysql truncate E2E (#31804)
fa0aefed5be is described below

commit fa0aefed5be3a97871854c697beea3716a4a720c
Author: ZhangCheng <chengzh...@apache.org>
AuthorDate: Fri Jun 21 18:45:25 2024 +0800

    Fix mysql truncate E2E (#31804)
---
 .../cases/truncate/MySQLXATruncateTestCase.java      |  5 ++---
 .../transaction/env/TransactionE2EEnvironment.java   | 20 --------------------
 .../src/test/resources/env/it-env.properties         |  2 +-
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
index f897aaa8d0b..57ab76307bf 100644
--- 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
+++ 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 /**
  * MySQL truncate XA transaction integration test.
  */
-@TransactionTestCase(dbTypes = TransactionTestConstants.MYSQL, adapters = 
TransactionTestConstants.PROXY, transactionTypes = TransactionType.XA)
+@TransactionTestCase(dbTypes = TransactionTestConstants.MYSQL, 
transactionTypes = TransactionType.XA)
 @Slf4j
 public final class MySQLXATruncateTestCase extends BaseTransactionTestCase {
     
@@ -60,12 +60,11 @@ public final class MySQLXATruncateTestCase extends 
BaseTransactionTestCase {
     }
     
     private void assertTruncateInMySQLXATransaction() throws SQLException {
-        // TODO This test case may cause bad effects to other test cases in 
JDBC adapter
         try (Connection connection = getDataSource().getConnection()) {
             connection.setAutoCommit(false);
             assertAccountRowCount(connection, 8);
             try {
-                connection.createStatement().execute("truncate account;");
+                connection.createStatement().execute("TRUNCATE account");
                 fail("Expect exception, but no exception report.");
             } catch (final TableModifyInTransactionException ex) {
                 log.info("Exception for expected in Proxy: {}", 
ex.getMessage());
diff --git 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
index 909297dcdde..b1516209550 100644
--- 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
+++ 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
@@ -156,26 +156,6 @@ public final class TransactionE2EEnvironment {
                 : StorageContainerConstants.PASSWORD;
     }
     
-    /**
-     * Get proxy password.
-     *
-     * @return proxy password
-     */
-    public String getProxyPassword() {
-        // TODO this should extract into a constant
-        return props.getOrDefault("transaction.it.proxy.password", 
ProxyContainerConstants.PASSWORD).toString();
-    }
-    
-    /**
-     * Get proxy userName.
-     *
-     * @return proxy userName
-     */
-    public String getProxyUserName() {
-        // TODO this should extract into a constant
-        return props.getOrDefault("transaction.it.proxy.username", 
ProxyContainerConstants.USERNAME).toString();
-    }
-    
     /**
      * Get instance.
      *
diff --git 
a/test/e2e/operation/transaction/src/test/resources/env/it-env.properties 
b/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
index 4fd7273922e..248d7e5cbb3 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
@@ -18,7 +18,7 @@
 transaction.it.env.type=NONE
 # transaction.it.proxy.binding.ports=63308:3308
 # transaction.it.env.cases=ClassicTransferTestCase
-transaction.it.env.cases=TransactionDeadlockTestCase, 
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase, 
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase, 
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase, 
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase, 
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase, 
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase, 
NestedTransactionTestCase,  [...]
+transaction.it.env.cases=TransactionDeadlockTestCase, 
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase, 
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase, 
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase, 
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase, 
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase, 
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase, 
NestedTransactionTestCase,  [...]
 # transaction.it.env.transtypes=LOCAL, XA, BASE
 transaction.it.env.transtypes=LOCAL, XA
 # transaction.it.env.xa.providers=Atomikos, Narayana