X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/f8e4cd540b87de3e308ec18a2b040b284a741522..4d7abe62a6dd692b71090819de0d57a40486bdb2:/hotline/server_blackbox_test.go?ds=inline diff --git a/hotline/server_blackbox_test.go b/hotline/server_blackbox_test.go index b45e279..06e7771 100644 --- a/hotline/server_blackbox_test.go +++ b/hotline/server_blackbox_test.go @@ -1,10 +1,13 @@ package hotline import ( + "cmp" + "encoding/binary" "encoding/hex" "github.com/stretchr/testify/assert" "log/slog" "os" + "slices" "testing" ) @@ -30,13 +33,20 @@ func assertTransferBytesEqual(t *testing.T, wantHexDump string, got []byte) bool return assert.Equal(t, wantHexDump, hex.Dump(clean)) } +var tranSortFunc = func(a, b Transaction) int { + return cmp.Compare( + binary.BigEndian.Uint16(a.clientID[:]), + binary.BigEndian.Uint16(b.clientID[:]), + ) +} + // tranAssertEqual compares equality of transactions slices after stripping out the random transaction ID func tranAssertEqual(t *testing.T, tran1, tran2 []Transaction) bool { var newT1 []Transaction var newT2 []Transaction for _, trans := range tran1 { - trans.ID = []byte{0, 0, 0, 0} + trans.ID = [4]byte{0, 0, 0, 0} var fs []Field for _, field := range trans.Fields { if field.ID == [2]byte{0x00, 0x6b} { // FieldRefNum @@ -52,7 +62,7 @@ func tranAssertEqual(t *testing.T, tran1, tran2 []Transaction) bool { } for _, trans := range tran2 { - trans.ID = []byte{0, 0, 0, 0} + trans.ID = [4]byte{0, 0, 0, 0} var fs []Field for _, field := range trans.Fields { if field.ID == [2]byte{0x00, 0x6b} { // FieldRefNum @@ -67,5 +77,8 @@ func tranAssertEqual(t *testing.T, tran1, tran2 []Transaction) bool { newT2 = append(newT2, trans) } + slices.SortFunc(newT1, tranSortFunc) + slices.SortFunc(newT2, tranSortFunc) + return assert.Equal(t, newT1, newT2) }