Finally fix A... this took too long
This commit is contained in:
@@ -45,9 +45,12 @@ func TestConnA(test *testing.T) {
|
||||
}
|
||||
}
|
||||
test.Log("CLIENT waiting for transaction close...")
|
||||
_, _, err = trans.Receive()
|
||||
gotMethod, gotPayload, err := trans.Receive()
|
||||
if !errors.Is(err, io.EOF) {
|
||||
test.Fatal("CLIENT wrong error:", err)
|
||||
test.Error("CLIENT wrong error:", err)
|
||||
test.Error("CLIENT method:", gotMethod)
|
||||
test.Error("CLIENT payload:", gotPayload)
|
||||
test.Fatal("CLIENT ok byeeeeeeeeeeeee")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +69,79 @@ func TestConnA(test *testing.T) {
|
||||
clientServerEnvironment(test, clientFunc, serverFunc)
|
||||
}
|
||||
|
||||
func TestTransOpenCloseA(test *testing.T) {
|
||||
// currently:
|
||||
//
|
||||
// | data sent | data recvd | close sent | close recvd
|
||||
// 10 | X | X | X | server hangs
|
||||
// 20 | X | X | X | client hangs
|
||||
// 30 | X | | X |
|
||||
//
|
||||
// when a close message is recvd, it tries to push to the trans and
|
||||
// hangs on trans.incoming.Send, which hangs on sending the value to the
|
||||
// underlying channel. why is this?
|
||||
//
|
||||
// check if we are really getting values from the channel when pulling
|
||||
// from the trans channel when we are expecting a close.
|
||||
|
||||
clientFunc := func(conn Conn) {
|
||||
// 10
|
||||
trans, err := conn.OpenTrans()
|
||||
if err != nil { test.Error("CLIENT", err); return }
|
||||
test.Log("CLIENT sending 10")
|
||||
trans.Send(10, []byte("hi"))
|
||||
trans.Close()
|
||||
|
||||
// 20
|
||||
test.Log("CLIENT awaiting 20")
|
||||
trans, err = conn.AcceptTrans()
|
||||
if err != nil { test.Error("CLIENT", err); return }
|
||||
test.Cleanup(func() { trans.Close() })
|
||||
gotMethod, gotPayload, err := trans.Receive()
|
||||
if err != nil { test.Error("CLIENT", err); return }
|
||||
test.Logf("CLIENT m: %d p: %s", gotMethod, gotPayload)
|
||||
if gotMethod != 20 { test.Error("CLIENT wrong method")}
|
||||
|
||||
// 30
|
||||
trans, err = conn.OpenTrans()
|
||||
if err != nil { test.Error("CLIENT", err); return }
|
||||
test.Log("CLIENT sending 30")
|
||||
trans.Send(30, []byte("good"))
|
||||
trans.Close()
|
||||
}
|
||||
|
||||
serverFunc := func(conn Conn) {
|
||||
// 10
|
||||
test.Log("SERVER awaiting 10")
|
||||
trans, err := conn.AcceptTrans()
|
||||
if err != nil { test.Error("SERVER", err); return }
|
||||
test.Cleanup(func() { trans.Close() })
|
||||
gotMethod, gotPayload, err := trans.Receive()
|
||||
if err != nil { test.Error("SERVER", err); return }
|
||||
test.Logf("SERVER m: %d p: %s", gotMethod, gotPayload)
|
||||
if gotMethod != 10 { test.Error("SERVER wrong method")}
|
||||
|
||||
// 20
|
||||
trans, err = conn.OpenTrans()
|
||||
if err != nil { test.Error("SERVER", err); return }
|
||||
test.Log("SERVER sending 20")
|
||||
trans.Send(20, []byte("hi how r u"))
|
||||
trans.Close()
|
||||
|
||||
// 30
|
||||
test.Log("SERVER awaiting 30")
|
||||
trans, err = conn.AcceptTrans()
|
||||
if err != nil { test.Error("SERVER", err); return }
|
||||
test.Cleanup(func() { trans.Close() })
|
||||
gotMethod, gotPayload, err = trans.Receive()
|
||||
if err != nil { test.Error("SERVER", err); return }
|
||||
test.Logf("SERVER m: %d p: %s", gotMethod, gotPayload)
|
||||
if gotMethod != 30 { test.Error("SERVER wrong method")}
|
||||
}
|
||||
|
||||
clientServerEnvironment(test, clientFunc, serverFunc)
|
||||
}
|
||||
|
||||
func TestEncodeMessageA(test *testing.T) {
|
||||
buffer := new(bytes.Buffer)
|
||||
payload := []byte { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }
|
||||
@@ -127,6 +203,28 @@ func TestDecodeMessageAErr(test *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestEncodeDecodeMessageA(test *testing.T) {
|
||||
correctTransID := int64(2)
|
||||
correctMethod := uint16(30)
|
||||
correctPayload := []byte("good")
|
||||
buffer := bytes.Buffer { }
|
||||
err := encodeMessageA(&buffer, defaultSizeLimit, correctTransID, correctMethod, correctPayload)
|
||||
if err != nil { test.Fatal(err) }
|
||||
transID, method, chunked, payload, err := decodeMessageA(&buffer, defaultSizeLimit)
|
||||
if got, correct := transID, int64(2); got != correct {
|
||||
test.Fatalf("not equal: %v %v", got, correct)
|
||||
}
|
||||
if got, correct := method, uint16(30); got != correct {
|
||||
test.Fatalf("not equal: %v %v", got, correct)
|
||||
}
|
||||
if chunked {
|
||||
test.Fatalf("message should not be chunked")
|
||||
}
|
||||
if got, correct := payload, correctPayload; !slices.Equal(got, correct) {
|
||||
test.Fatalf("not equal: %v %v", got, correct)
|
||||
}
|
||||
}
|
||||
|
||||
func clientServerEnvironment(test *testing.T, clientFunc func(conn Conn), serverFunc func(conn Conn)) {
|
||||
network := "tcp"
|
||||
addr := "localhost:7959"
|
||||
@@ -145,6 +243,7 @@ func clientServerEnvironment(test *testing.T, clientFunc func(conn Conn), server
|
||||
test.Cleanup(func() { a.Close() })
|
||||
|
||||
serverFunc(a)
|
||||
test.Log("SERVER closing")
|
||||
}()
|
||||
|
||||
// client
|
||||
@@ -158,9 +257,10 @@ func clientServerEnvironment(test *testing.T, clientFunc func(conn Conn), server
|
||||
clientFunc(a)
|
||||
|
||||
test.Log("CLIENT waiting for connection close...")
|
||||
_, err = a.AcceptTrans()
|
||||
trans, err := a.AcceptTrans()
|
||||
if !errors.Is(err, io.EOF) {
|
||||
test.Fatal("CLIENT wrong error:", err)
|
||||
test.Error("CLIENT wrong error:", err)
|
||||
test.Fatal("CLIENT trans:", trans)
|
||||
}
|
||||
test.Log("CLIENT DONE")
|
||||
conn.Close()
|
||||
|
||||
Reference in New Issue
Block a user