fix[protocol]: remove char test

zfoo-project · Oct 17, 2023 · dd0d059 · dd0d059
1 parent d6cf7fe
commit dd0d059
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 290 deletions.
diff --git a/net/src/test/java/com/zfoo/net/core/csharp/ServerPacketController.java b/net/src/test/java/com/zfoo/net/core/csharp/ServerPacketController.java
diff --git a/net/src/test/java/com/zfoo/net/core/csharp/ServerTest.java b/net/src/test/java/com/zfoo/net/core/csharp/ServerTest.java
diff --git a/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java b/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java
@@ -35,7 +35,7 @@ public class TcpServerTest {
     public void startServer() {
         var context = new ClassPathXmlApplicationContext("config.xml");
 
-        var server = new TcpServer(HostAndPort.valueOf("127.0.0.1:9000"));
+        var server = new TcpServer(HostAndPort.valueOf("0.0.0.0:9000"));
         server.start();
         ThreadUtils.sleep(Long.MAX_VALUE);
     }

diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Int.java b/net/src/test/java/com/zfoo/net/packet/CM_Int.java
@@ -33,7 +33,6 @@ public class CM_Int {
 
     private long d;
 
-    private char e;
 
     private String f;
 
@@ -57,14 +56,6 @@ public byte getA() {
         return a;
     }
 
-    public char getE() {
-        return e;
-    }
-
-    public void setE(char e) {
-        this.e = e;
-    }
-
     public void setA(byte a) {
         this.a = a;
     }
@@ -104,12 +95,11 @@ public boolean equals(Object o) {
                 b == cm_int.b &&
                 c == cm_int.c &&
                 d == cm_int.d &&
-                e == cm_int.e &&
                 f.equals(cm_int.f);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(flag, a, b, c, d, e, f);
+        return Objects.hash(flag, a, b, c, d, f);
     }
 }
diff --git a/net/src/test/java/com/zfoo/net/packet/SM_Int.java b/net/src/test/java/com/zfoo/net/packet/SM_Int.java
@@ -33,8 +33,6 @@ public class SM_Int {
 
     private Long d;
 
-    private char e;
-
     private String f;
 
     public Boolean getFlag() {
@@ -77,14 +75,6 @@ public void setD(Long d) {
         this.d = d;
     }
 
-    public char getE() {
-        return e;
-    }
-
-    public void setE(char e) {
-        this.e = e;
-    }
-
     public String getF() {
         return f;
     }
@@ -98,8 +88,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         SM_Int sm_int = (SM_Int) o;
-        return e == sm_int.e &&
-                flag.equals(sm_int.flag) &&
+        return flag.equals(sm_int.flag) &&
                 a.equals(sm_int.a) &&
                 b.equals(sm_int.b) &&
                 c.equals(sm_int.c) &&
@@ -109,7 +98,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(flag, a, b, c, d, e, f);
+        return Objects.hash(flag, a, b, c, d, f);
     }
 }
 
diff --git a/net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java b/net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java
diff --git a/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java b/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java
diff --git a/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java b/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java
diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java
@@ -53,9 +53,6 @@ public class WebSocketPacketRequest {
     private double[] fff;
     private Double[] ffff;
 
-    private char g;
-    private char[] gg;
-    private List<Character> ggg;
 
     private String jj;
     private String[] jjj;
@@ -256,30 +253,6 @@ public void setFfff(Double[] ffff) {
         this.ffff = ffff;
     }
 
-    public char getG() {
-        return g;
-    }
-
-    public void setG(char g) {
-        this.g = g;
-    }
-
-    public char[] getGg() {
-        return gg;
-    }
-
-    public void setGg(char[] gg) {
-        this.gg = gg;
-    }
-
-    public List<Character> getGgg() {
-        return ggg;
-    }
-
-    public void setGgg(List<Character> ggg) {
-        this.ggg = ggg;
-    }
-
     public String getJj() {
         return jj;
     }

diff --git a/net/src/test/resources/protocol.xml b/net/src/test/resources/protocol.xml
@@ -56,10 +56,6 @@
         <protocol id="1152" location="com.zfoo.net.packet.tcp.AsyncMessAsk" enhance="false"/>
         <protocol id="1153" location="com.zfoo.net.packet.tcp.AsyncMessAnswer" enhance="false"/>
 
-        <protocol id="1165" location="com.zfoo.net.packet.csharp.CM_CSharpRequest" enhance="false"/>
-        <protocol id="1166" location="com.zfoo.net.packet.csharp.CSharpObjectA" enhance="false"/>
-        <protocol id="1167" location="com.zfoo.net.packet.csharp.CSharpObjectB" enhance="false"/>
-
         <protocol id="1200" location="com.zfoo.net.packet.udp.UdpHelloRequest"/>
         <protocol id="1201" location="com.zfoo.net.packet.udp.UdpHelloResponse"/>