fix

Bughue · Jul 30, 2024 · ea8d872 · ea8d872
1 parent 5d1831c
commit ea8d872
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/test-old-version/src/test/java/io/seata/MockTest.java b/test-old-version/src/test/java/io/seata/MockTest.java
@@ -100,10 +100,11 @@ private String doTestCommit(int times) throws TransactionException, NoSuchMethod
         TransactionManager tm = TmClientTest.getTm();
         DefaultResourceManager rm = RmClientTest.getRm(RESOURCE_ID);
 
-        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test", 60000);
+        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test-commit", 60000);
+        logger.info("doTestCommit(0.6.1) xid:{}", xid);
         MockCoordinator.getInstance().setExpectedRetry(xid, times);
         Long branchId = rm.branchRegister(BranchType.TCC, RESOURCE_ID, "1", xid, "{\"mock\":\"mock\"}", "1");
-        logger.info("branch register ok, branchId=" + branchId);
+        logger.info("branch register(0.6.1) ok, branchId=" + branchId);
         GlobalStatus commit = tm.commit(xid);
         Assertions.assertEquals(GlobalStatus.Committed, commit);
         return xid;
@@ -113,11 +114,11 @@ private String doTestRollback(int times) throws TransactionException, NoSuchMeth
         TransactionManager tm = TmClientTest.getTm();
         DefaultResourceManager rm = RmClientTest.getRm(RESOURCE_ID);
 
-        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test", 60000);
-        logger.info("doTestRollback xid:{}", xid);
+        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test-rollback", 60000);
+        logger.info("doTestRollback(0.6.1) xid:{}", xid);
         MockCoordinator.getInstance().setExpectedRetry(xid, times);
         Long branchId = rm.branchRegister(BranchType.TCC, RESOURCE_ID, "1", xid, "{\"mock\":\"mock\"}", "1");
-        logger.info("branch register ok, branchId=" + branchId);
+        logger.info("branch register(0.6.1) ok, branchId=" + branchId);
         GlobalStatus rollback = tm.rollback(xid);
         Assertions.assertEquals(GlobalStatus.Rollbacked, rollback);
         return xid;

diff --git a/test-old-version/src/test/resources/file.conf b/test-old-version/src/test/resources/file.conf
@@ -57,7 +57,7 @@ service {
   vgroup_mapping.default_tx_group = "default"
   vgroup_mapping.mock_tx_group = "mock"
   #only support when registry.type=file, please don't set multiple addresses
-  default.grouplist = "127.0.0.1:8077"
+  default.grouplist = "127.0.0.1:8078"
   mock.grouplist = "127.0.0.1:8077"
   #disable seata
   disableGlobalTransaction = false

diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java
@@ -104,7 +104,7 @@ private String doTestCommit(int times) throws TransactionException {
         TransactionManager tm = TmClientTest.getTm();
         DefaultResourceManager rm = RmClientTest.getRm(RESOURCE_ID);
 
-        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test", 60000);
+        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test-commit", 60000);
         MockCoordinator.getInstance().setExpectedRetry(xid, times);
         Long branchId = rm.branchRegister(BranchType.TCC, RESOURCE_ID, "1", xid, "{\"mock\":\"mock\"}", "1");
         GlobalStatus commit = tm.commit(xid);
@@ -117,7 +117,7 @@ private String doTestRollback(int times) throws TransactionException {
         TransactionManager tm = TmClientTest.getTm();
         DefaultResourceManager rm = RmClientTest.getRm(RESOURCE_ID);
 
-        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test", 60000);
+        String xid = tm.begin(ProtocolTestConstants.APPLICATION_ID, ProtocolTestConstants.SERVICE_GROUP, "test-rollback", 60000);
         logger.info("doTestRollback xid:{}", xid);
         MockCoordinator.getInstance().setExpectedRetry(xid, times);
         Long branchId = rm.branchRegister(BranchType.TCC, RESOURCE_ID, "1", xid, "{\"mock\":\"mock\"}", "1");