sashakoshka/hopp
sashakoshka/hopp
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Make the TestConnA pass

Browse Source
This commit is contained in:
Sasha Koshka 2025-04-25 15:08:31 -04:00
parent 8fe3ba8d4f
commit 86cf3ee89d
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
metadapta_test.go
View File

@ -31,21 +31,23 @@ func TestConnA(test *testing.T) {
// server // server
listener, err := net.Listen(network, addr) listener, err := net.Listen(network, addr)
if err != nil { test.Fatal(err) } if err != nil { test.Fatal(err) }
defer listener.Close() test.Cleanup(func() { listener.Close() })
go func() { go func() {
test.Log("SERVER listening") test.Log("SERVER listening")
conn, err := listener.Accept() conn, err := listener.Accept()
if err != nil { test.Error("SERVER", err); return } if err != nil { test.Error("SERVER", err); return }
defer conn.Close() defer conn.Close()
test.Cleanup(func() { conn.Close() })
a := AdaptA(conn, ServerSide) a := AdaptA(conn, ServerSide)
trans, err := a.OpenTrans() trans, err := a.OpenTrans()
if err != nil { test.Error("SERVER", err); return } if err != nil { test.Error("SERVER", err); return }
defer trans.Close() test.Cleanup(func() { trans.Close() })
for method, payload := range payloads { for method, payload := range payloads {
test.Log("SERVER", method, payload) test.Log("SERVER m:", method, "p:", payload)
err := trans.Send(uint16(method), []byte(payload)) err := trans.Send(uint16(method), []byte(payload))
if err != nil { test.Error("SERVER", err); return } if err != nil { test.Error("SERVER", err); return }
} }
test.Log("SERVER closing connection")
}() }()
// client // client
@ -54,18 +56,18 @@ func TestConnA(test *testing.T) {
if err != nil { test.Fatal("CLIENT", err) } if err != nil { test.Fatal("CLIENT", err) }
test.Log("CLIENT dialed") test.Log("CLIENT dialed")
a := AdaptA(conn, ClientSide) a := AdaptA(conn, ClientSide)
defer a.Close() test.Cleanup(func() { a.Close() })
test.Log("CLIENT accepting transaction") test.Log("CLIENT accepting transaction")
trans, err := a.AcceptTrans() trans, err := a.AcceptTrans()
if err != nil { test.Fatal("CLIENT", err) } if err != nil { test.Fatal("CLIENT", err) }
test.Log("CLIENT accepted transaction") test.Log("CLIENT accepted transaction")
defer trans.Close() test.Cleanup(func() { trans.Close() })
for method, payload := range payloads { for method, payload := range payloads {
test.Log("CLIENT waiting...") test.Log("CLIENT waiting...")
gotMethod, gotPayloadBytes, err := trans.Receive() gotMethod, gotPayloadBytes, err := trans.Receive()
if err != nil { test.Fatal("CLIENT", err) } if err != nil { test.Fatal("CLIENT", err) }
gotPayload := string(gotPayloadBytes) gotPayload := string(gotPayloadBytes)
test.Log("CLIENT", gotMethod, gotPayload) test.Log("CLIENT m:", gotMethod, "p:", gotPayload)
if int(gotMethod) != method { if int(gotMethod) != method {
test.Errorf("CLIENT method not equal") test.Errorf("CLIENT method not equal")
} }
@ -73,11 +75,13 @@ func TestConnA(test *testing.T) {
test.Errorf("CLIENT payload not equal") test.Errorf("CLIENT payload not equal")
} }
} }
test.Log("CLIENT waiting for connection close...")
_, _, err = trans.Receive() _, _, err = trans.Receive()
if !errors.Is(err, io.EOF) { if !errors.Is(err, io.EOF) {
test.Fatal("CLIENT wrong error:", err) test.Fatal("CLIENT wrong error:", err)
} }
test.Log("CLIENT done") test.Log("CLIENT done")
conn.Close()
} }
func TestEncodeMessageA(test *testing.T) { func TestEncodeMessageA(test *testing.T) {
@ -87,7 +91,7 @@ func TestEncodeMessageA(test *testing.T) {
correct := []byte { correct := []byte {
0x58, 0x00, 0xFE, 0xAB, 0xC3, 0x10, 0x4F, 0x04, 0x58, 0x00, 0xFE, 0xAB, 0xC3, 0x10, 0x4F, 0x04,
0x6B, 0x12, 0x6B, 0x12,
0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
} }
if err != nil { if err != nil {
@ -111,9 +115,9 @@ func TestDecodeMessageA(test *testing.T) {
transID, method, _, payload, err := decodeMessageA(bytes.NewReader([]byte { transID, method, _, payload, err := decodeMessageA(bytes.NewReader([]byte {
0x58, 0x00, 0xFE, 0xAB, 0xC3, 0x10, 0x4F, 0x04, 0x58, 0x00, 0xFE, 0xAB, 0xC3, 0x10, 0x4F, 0x04,
0x6B, 0x12, 0x6B, 0x12,
0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
})) }), defaultSizeLimit)
if err != nil { if err != nil {
test.Fatal(err) test.Fatal(err)
} }
@ -133,9 +137,9 @@ func TestDecodeMessageAErr(test *testing.T) {
_, _, _, _, err := decodeMessageA(bytes.NewReader([]byte { _, _, _, _, err := decodeMessageA(bytes.NewReader([]byte {
0x58, 0x00, 0xFE, 0xAB, 0xC3, 0x10, 0x4F, 0x04, 0x58, 0x00, 0xFE, 0xAB, 0xC3, 0x10, 0x4F, 0x04,
0x6B, 0x12, 0x6B, 0x12,
0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
})) }), defaultSizeLimit)
if !errors.Is(err, io.ErrUnexpectedEOF) { if !errors.Is(err, io.ErrUnexpectedEOF) {
test.Fatalf("wrong error: %v", err) test.Fatalf("wrong error: %v", err)
} }