move protocol test to protocol test directory (#3864)

Junwang Zhao · web-flow · commit 88d472ef1e2e · 2022-05-13T11:16:06.000+08:00
1. move the protocol test to right directory
2. fix wrong string format params count

Signed-off-by: 元组 &lt;zhaojunwang.zjw@alibaba-inc.com&gt;
diff --git a/common/src/test/java/com/alibaba/otter/canal/common/ServerRunningTest.java b/common/src/test/java/com/alibaba/otter/canal/common/ServerRunningTest.java
@@ -106,21 +106,21 @@ private ServerRunningMonitor buildServerRunning(final CountDownLatch countLatch,
         runningMonitor.setListener(new ServerRunningListener() {
 
             public void processActiveEnter() {
-                System.out.println(String.format("cid:%s ip:%s:%s has start", ip, port));
+                System.out.println(String.format("ip:%s:%s has start", ip, port));
                 countLatch.countDown();
             }
 
             public void processActiveExit() {
-                System.out.println(String.format("cid:%s ip:%s:%s has stop", ip, port));
+                System.out.println(String.format("ip:%s:%s has stop", ip, port));
                 countLatch.countDown();
             }
 
             public void processStart() {
-                System.out.println(String.format("cid:%s ip:%s:%s processStart", ip, port));
+                System.out.println(String.format("ip:%s:%s processStart", ip, port));
             }
 
             public void processStop() {
-                System.out.println(String.format("cid:%s ip:%s:%s processStop", ip, port));
+                System.out.println(String.format("ip:%s:%s processStop", ip, port));
             }
 
         });
diff --git a/protocol/src/test/java/com/alibaba/otter/canal/protocol/ProtocolTest.java b/protocol/src/test/java/com/alibaba/otter/canal/protocol/ProtocolTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.otter.canal.server;
+package com.alibaba.otter.canal.protocol;
 
 import com.alibaba.otter.canal.protocol.CanalEntry.Entry;
 import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
diff --git a/protocol/src/test/java/com/alibaba/otter/canal/protocol/SecurityUtilTest.java b/protocol/src/test/java/com/alibaba/otter/canal/protocol/SecurityUtilTest.java
@@ -1,4 +1,4 @@
-package com.alibaba.otter.canal.server;
+package com.alibaba.otter.canal.protocol;
 
 import java.security.NoSuchAlgorithmException;
 

Original file line number	Diff line number	Diff line change
`@@ -106,21 +106,21 @@ private ServerRunningMonitor buildServerRunning(final CountDownLatch countLatch,`
`106`	`106`	`runningMonitor.setListener(new ServerRunningListener() {`
`107`	`107`
`108`	`108`	`public void processActiveEnter() {`
`109`		`- System.out.println(String.format("cid:%s ip:%s:%s has start", ip, port));`
	`109`	`+ System.out.println(String.format("ip:%s:%s has start", ip, port));`
`110`	`110`	`countLatch.countDown();`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public void processActiveExit() {`
`114`		`- System.out.println(String.format("cid:%s ip:%s:%s has stop", ip, port));`
	`114`	`+ System.out.println(String.format("ip:%s:%s has stop", ip, port));`
`115`	`115`	`countLatch.countDown();`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`public void processStart() {`
`119`		`- System.out.println(String.format("cid:%s ip:%s:%s processStart", ip, port));`
	`119`	`+ System.out.println(String.format("ip:%s:%s processStart", ip, port));`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`public void processStop() {`
`123`		`- System.out.println(String.format("cid:%s ip:%s:%s processStop", ip, port));`
	`123`	`+ System.out.println(String.format("ip:%s:%s processStop", ip, port));`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.alibaba.otter.canal.server;`
	`1`	`+package com.alibaba.otter.canal.protocol;`
`2`	`2`
`3`	`3`	`import com.alibaba.otter.canal.protocol.CanalEntry.Entry;`
`4`	`4`	`import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;`