test : fix mockserverTest fail cause using same port with seata-server

core/src/main/java/org/apache/seata/core/rpc/netty/AbstractNettyRemotingServer.java

@@ -268,4 +268,8 @@ public void close(ChannelHandlerContext ctx, ChannelPromise future) throws Excep
         }
 
     }
+
+    protected void setListenPort(int listenPort){
+        this.serverBootstrap.setListenPort(listenPort);
+    }
 }

test-mock-server/pom.xml

@@ -40,7 +40,7 @@
         </plugins>
     </build>
 
-    <dependencies>
+        <dependencies>
         <dependency>
             <groupId>org.apache.seata</groupId>
             <artifactId>seata-server</artifactId>

test-mock-server/src/main/java/org/apache/seata/mockserver/MockNettyRemotingServer.java

@@ -55,8 +55,9 @@ public void init() {
      *
      * @param messageExecutor the message executor
      */
-    public MockNettyRemotingServer(ThreadPoolExecutor messageExecutor) {
+    public MockNettyRemotingServer(ThreadPoolExecutor messageExecutor,int port) {
         super(messageExecutor, new NettyServerConfig());
+        setListenPort(port);
     }
 
     @Override

test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java

@@ -56,11 +56,11 @@ public static void start() {
                 50, 500, TimeUnit.SECONDS,
                 new LinkedBlockingQueue<>(20000),
                 new NamedThreadFactory("ServerHandlerThread", 500), new ThreadPoolExecutor.CallerRunsPolicy());
-        nettyRemotingServer = new MockNettyRemotingServer(workingThreads);
+        nettyRemotingServer = new MockNettyRemotingServer(workingThreads, 8099);
 
         // set registry
         XID.setIpAddress(NetUtil.getLocalIp());
-        XID.setPort(8092);
+        XID.setPort(8099);
         // init snowflake for transactionId, branchId
         UUIDGenerator.init(1L);
 

test-mock-server/src/main/java/org/apache/seata/mockserver/call/CallRm.java

@@ -98,7 +98,7 @@ private static void setReq(AbstractBranchEndRequest request, BranchSession branc
         request.setXid(branchSession.getXid());
         request.setBranchId(branchSession.getBranchId());
         request.setResourceId(branchSession.getResourceId());
-        request.setApplicationData("{\"k\":\"v\"}");
+        request.setApplicationData("{\"actionContext\":{\"mock\":\"mock\"}}");
         request.setBranchType(BranchType.TCC);
         // todo AT SAGA
     }

test-mock-server/src/main/resources/application.yml

@@ -16,6 +16,7 @@
 #
 server:
   port: 7091
+  servicePort: 8099
 
 spring:
   application:

test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/Action1Impl.java

@@ -41,17 +41,16 @@ public String insert(Long reqId, Map<String, String> params) {
     @Override
     public boolean commitTcc(BusinessActionContext actionContext) {
         String xid = actionContext.getXid();
-        System.out.println("commitTcc:" + xid);
+        System.out.println("commitTcc:" + xid + "," + actionContext.getActionContext());
         commitMap.compute(xid, (k, v) -> v == null ? 1 : v + 1);
         return true;
     }
 
     @Override
     public boolean cancel(BusinessActionContext actionContext) {
         String xid = actionContext.getXid();
-        System.out.println("commitTcc:" + xid);
+        System.out.println("cancelTcc:" + xid + "," + actionContext.getActionContext());
         rollbackMap.compute(xid, (k, v) -> v == null ? 1 : v + 1);
-        System.out.println("cancel");
         return true;
     }
 

test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java

@@ -45,29 +45,29 @@ public static void after() {
     @Test
     public void testCommit() throws TransactionException {
         String xid = doTestCommit(0);
-        Assertions.assertEquals(Action1Impl.getCommitTimes(xid), 1);
-        Assertions.assertEquals(Action1Impl.getRollbackTimes(xid), 0);
+        Assertions.assertEquals(1, Action1Impl.getCommitTimes(xid));
+        Assertions.assertEquals(0, Action1Impl.getRollbackTimes(xid));
     }
 
     @Test
     public void testCommitRetry() throws TransactionException {
         String xid = doTestCommit(2);
-        Assertions.assertEquals(Action1Impl.getCommitTimes(xid), 3);
-        Assertions.assertEquals(Action1Impl.getRollbackTimes(xid), 0);
+        Assertions.assertEquals(3, Action1Impl.getCommitTimes(xid));
+        Assertions.assertEquals(0, Action1Impl.getRollbackTimes(xid));
     }
 
     @Test
     public void testRollback() throws TransactionException {
         String xid = doTestRollback(0);
-        Assertions.assertEquals(Action1Impl.getCommitTimes(xid), 0);
-        Assertions.assertEquals(Action1Impl.getRollbackTimes(xid), 1);
+        Assertions.assertEquals(0, Action1Impl.getCommitTimes(xid));
+        Assertions.assertEquals(1, Action1Impl.getRollbackTimes(xid));
     }
 
     @Test
     public void testRollbackRetry() throws TransactionException {
         String xid = doTestRollback(2);
-        Assertions.assertEquals(Action1Impl.getCommitTimes(xid), 0);
-        Assertions.assertEquals(Action1Impl.getRollbackTimes(xid), 3);
+        Assertions.assertEquals(0, Action1Impl.getCommitTimes(xid));
+        Assertions.assertEquals(3, Action1Impl.getRollbackTimes(xid));
     }
 
     private static String doTestCommit(int times) throws TransactionException {
@@ -78,7 +78,7 @@ private static String doTestCommit(int times) throws TransactionException {
         MockCoordinator.getInstance().setExpectedRetry(xid, times);
         Long branchId = rm.branchRegister(BranchType.AT, RESOURCE_ID, "1", xid, "1", "1");
         GlobalStatus commit = tm.commit(xid);
-        Assertions.assertEquals(commit, GlobalStatus.Committed);
+        Assertions.assertTrue(commit == GlobalStatus.Committed || commit == GlobalStatus.Finished);
         return xid;
 
     }
@@ -91,7 +91,7 @@ private static String doTestRollback(int times) throws TransactionException {
         MockCoordinator.getInstance().setExpectedRetry(xid, times);
         Long branchId = rm.branchRegister(BranchType.AT, RESOURCE_ID, "1", xid, "1", "1");
         GlobalStatus rollback = tm.rollback(xid);
-        Assertions.assertEquals(rollback, GlobalStatus.Rollbacked);
+        Assertions.assertTrue(rollback == GlobalStatus.Rollbacked || rollback == GlobalStatus.Finished);
         return xid;
 
     }

test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/ProtocolTestConstants.java

@@ -22,6 +22,7 @@
  **/
 public class ProtocolTestConstants {
     public static final String APPLICATION_ID = "my_app_test";
-    public static final String SERVICE_GROUP = "default_tx_group";
-    public static final String SERVER_ADDRESS = "0.0.0.0:8091";
+    public static final String SERVICE_GROUP = "mock_tx_group";
+    public static final String SERVER_PORT = "8099";
+    public static final String SERVER_ADDRESS = "0.0.0.0:" + SERVER_PORT;
 }

test/src/test/resources/file.conf

@@ -55,8 +55,10 @@ transport {
 service {
   #transaction service group mapping
   vgroupMapping.default_tx_group = "default"
+  vgroupMapping.mock_tx_group = "mock"
   #only support when registry.type=file, please don't set multiple addresses
   default.grouplist = "127.0.0.1:8091"
+  mock.grouplist = "127.0.0.1:8099"
   #disable seata
   disableGlobalTransaction = false
 }