Clean up test case code

mohanson · Oct 6, 2024 · 87408f5 · 87408f5
1 parent 5a2ac2c
commit 87408f5
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 114 deletions.
diff --git a/protocol/ashe/engine_test.go b/protocol/ashe/engine_test.go
@@ -17,9 +17,9 @@ const (
 )
 
 func TestProtocolAsheTCP(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -36,7 +36,6 @@ func TestProtocolAsheTCP(t *testing.T) {
 		cnt int
 		rsz = int(rand.Uint32N(65536))
 	)
-
 	copy(buf[0:2], []byte{0x00, 0x00})
 	binary.BigEndian.PutUint16(buf[2:], uint16(rsz))
 	doa.Try(cli.Write(buf[:4]))
@@ -52,7 +51,6 @@ func TestProtocolAsheTCP(t *testing.T) {
 			break
 		}
 	}
-
 	copy(buf[0:2], []byte{0x01, 0x00})
 	binary.BigEndian.PutUint16(buf[2:], uint16(rsz))
 	doa.Try(cli.Write(buf[:4]))
@@ -71,9 +69,9 @@ func TestProtocolAsheTCP(t *testing.T) {
 }
 
 func TestProtocolAsheTCPClientClose(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -85,17 +83,15 @@ func TestProtocolAsheTCPClientClose(t *testing.T) {
 	defer cli.Close()
 
 	cli.Close()
-	_, er1 := cli.Write([]byte{0x02, 0x00, 0x00, 0x00})
-	doa.Doa(er1 != nil)
-	buf := make([]byte, 2048)
-	_, er2 := io.ReadFull(cli, buf[:1])
-	doa.Doa(er2 != nil)
+	doa.Doa(doa.Err(cli.Write([]byte{0x02, 0x00, 0x00, 0x00})) != nil)
+	buf := make([]byte, 1)
+	doa.Doa(doa.Err(io.ReadFull(cli, buf[:1])) != nil)
 }
 
 func TestProtocolAsheTCPServerClose(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -106,16 +102,15 @@ func TestProtocolAsheTCPServerClose(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "tcp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	doa.Try(cli.Write([]byte{0x02, 0x00, 0x00, 0x00}))
-	_, err := io.ReadFull(cli, buf[:1])
-	doa.Doa(err != nil)
+	buf := make([]byte, 1)
+	doa.Doa(doa.Err(io.ReadFull(cli, buf[:1])) != nil)
 }
 
 func TestProtocolAsheUDP(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.UDP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.UDP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -126,7 +121,7 @@ func TestProtocolAsheUDP(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "udp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	doa.Try(cli.Write([]byte{0x00, 0x00, 0x00, 0x80}))
+	buf := make([]byte, 128)
 	doa.Try(io.ReadFull(cli, buf[:128]))
 }
diff --git a/protocol/baboon/engine_test.go b/protocol/baboon/engine_test.go
@@ -19,9 +19,9 @@ const (
 )
 
 func TestProtocolBaboonTCP(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -38,7 +38,6 @@ func TestProtocolBaboonTCP(t *testing.T) {
 		cnt int
 		rsz = int(rand.Uint32N(65536))
 	)
-
 	copy(buf[0:2], []byte{0x00, 0x00})
 	binary.BigEndian.PutUint16(buf[2:], uint16(rsz))
 	doa.Try(cli.Write(buf[:4]))
@@ -54,7 +53,6 @@ func TestProtocolBaboonTCP(t *testing.T) {
 			break
 		}
 	}
-
 	copy(buf[0:2], []byte{0x01, 0x00})
 	binary.BigEndian.PutUint16(buf[2:], uint16(rsz))
 	doa.Try(cli.Write(buf[:4]))
@@ -73,9 +71,9 @@ func TestProtocolBaboonTCP(t *testing.T) {
 }
 
 func TestProtocolBaboonTCPClientClose(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -87,17 +85,15 @@ func TestProtocolBaboonTCPClientClose(t *testing.T) {
 	defer cli.Close()
 
 	cli.Close()
-	_, er1 := cli.Write([]byte{0x02, 0x00, 0x00, 0x00})
-	doa.Doa(er1 != nil)
-	buf := make([]byte, 2048)
-	_, er2 := io.ReadFull(cli, buf[:1])
-	doa.Doa(er2 != nil)
+	doa.Doa(doa.Err(cli.Write([]byte{0x02, 0x00, 0x00, 0x00})) != nil)
+	buf := make([]byte, 1)
+	doa.Doa(doa.Err(io.ReadFull(cli, buf[:1])) != nil)
 }
 
 func TestProtocolBaboonTCPServerClose(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -108,16 +104,15 @@ func TestProtocolBaboonTCPServerClose(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "tcp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	doa.Try(cli.Write([]byte{0x02, 0x00, 0x00, 0x00}))
-	_, err := io.ReadFull(cli, buf[:1])
-	doa.Doa(err != nil)
+	buf := make([]byte, 1)
+	doa.Doa(doa.Err(io.ReadFull(cli, buf[:1])) != nil)
 }
 
 func TestProtocolBaboonUDP(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.UDP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.UDP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -128,8 +123,8 @@ func TestProtocolBaboonUDP(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "udp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	doa.Try(cli.Write([]byte{0x00, 0x00, 0x00, 0x80}))
+	buf := make([]byte, 128)
 	doa.Try(io.ReadFull(cli, buf[:128]))
 }
 

diff --git a/protocol/czar/engine_test.go b/protocol/czar/engine_test.go
@@ -17,9 +17,9 @@ const (
 )
 
 func TestProtocolCzarTCP(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -37,7 +37,6 @@ func TestProtocolCzarTCP(t *testing.T) {
 		cnt int
 		rsz = int(rand.Uint32N(65536))
 	)
-
 	copy(buf[0:2], []byte{0x00, 0x00})
 	binary.BigEndian.PutUint16(buf[2:], uint16(rsz))
 	doa.Try(cli.Write(buf[:4]))
@@ -53,7 +52,6 @@ func TestProtocolCzarTCP(t *testing.T) {
 			break
 		}
 	}
-
 	copy(buf[0:2], []byte{0x01, 0x00})
 	binary.BigEndian.PutUint16(buf[2:], uint16(rsz))
 	doa.Try(cli.Write(buf[:4]))
@@ -72,9 +70,9 @@ func TestProtocolCzarTCP(t *testing.T) {
 }
 
 func TestProtocolCzarTCPClientClose(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -86,18 +84,16 @@ func TestProtocolCzarTCPClientClose(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "tcp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	cli.Close()
-	_, er1 := cli.Write([]byte{0x02, 0x00, 0x00, 0x00})
-	doa.Doa(er1 != nil)
-	_, er2 := io.ReadFull(cli, buf[:1])
-	doa.Doa(er2 != nil)
+	doa.Doa(doa.Err(cli.Write([]byte{0x02, 0x00, 0x00, 0x00})) != nil)
+	buf := make([]byte, 1)
+	doa.Doa(doa.Err(io.ReadFull(cli, buf[:1])) != nil)
 }
 
 func TestProtocolCzarTCPServerClose(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.TCP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.TCP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -109,16 +105,15 @@ func TestProtocolCzarTCPServerClose(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "tcp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	doa.Try(cli.Write([]byte{0x02, 0x00, 0x00, 0x00}))
-	_, err := io.ReadFull(cli, buf[:1])
-	doa.Doa(err != nil)
+	buf := make([]byte, 1)
+	doa.Doa(doa.Err(io.ReadFull(cli, buf[:1])) != nil)
 }
 
 func TestProtocolCzarUDP(t *testing.T) {
-	remote := daze.NewTester(EchoServerListenOn)
-	defer remote.Close()
-	remote.UDP()
+	dazeRemote := daze.NewTester(EchoServerListenOn)
+	defer dazeRemote.Close()
+	dazeRemote.UDP()
 
 	dazeServer := NewServer(DazeServerListenOn, Password)
 	defer dazeServer.Close()
@@ -130,7 +125,7 @@ func TestProtocolCzarUDP(t *testing.T) {
 	cli := doa.Try(dazeClient.Dial(ctx, "udp", EchoServerListenOn))
 	defer cli.Close()
 
-	buf := make([]byte, 2048)
 	doa.Try(cli.Write([]byte{0x00, 0x00, 0x00, 0x80}))
+	buf := make([]byte, 128)
 	doa.Try(io.ReadFull(cli, buf[:128]))
 }