Update README.md

[rbdr/mobius] / hotline / server_blackbox_test.go

diff --git a/hotline/server_blackbox_test.go b/hotline/server_blackbox_test.go
index 138a17f285ca782e64c8c2c79811c893ef9789e4..06e7771eef1342d84402235206d2fb489f576aed 100644 (file)
--- a/hotline/server_blackbox_test.go
+++ b/hotline/server_blackbox_test.go
@@ -1,30 +1,18 @@
 package hotline
 
 import (
 package hotline
 
 import (

-       "bytes"
+       "cmp"
+       "encoding/binary"

        "encoding/hex"
        "github.com/stretchr/testify/assert"
        "encoding/hex"
        "github.com/stretchr/testify/assert"

-       "go.uber.org/zap"
-       "go.uber.org/zap/zapcore"
+       "log/slog"

        "os"
        "os"

+       "slices"

        "testing"
 )
 
        "testing"
 )
 

-func NewTestLogger() *zap.SugaredLogger {
-       encoderCfg := zap.NewProductionEncoderConfig()
-       encoderCfg.TimeKey = "timestamp"
-       encoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
-
-       core := zapcore.NewCore(
-               zapcore.NewConsoleEncoder(encoderCfg),
-               zapcore.Lock(os.Stdout),
-               zap.DebugLevel,
-       )
-
-       cores := []zapcore.Core{core}
-       l := zap.New(zapcore.NewTee(cores...))
-       defer func() { _ = l.Sync() }()
-       return l.Sugar()
+func NewTestLogger() *slog.Logger {
+       return slog.New(slog.NewTextHandler(os.Stdout, nil))

 }
 
 // assertTransferBytesEqual takes a string with a hexdump in the same format that `hexdump -C` produces and compares with
 }
 
 // assertTransferBytesEqual takes a string with a hexdump in the same format that `hexdump -C` produces and compares with


@@ -45,16 +33,26 @@ func assertTransferBytesEqual(t *testing.T, wantHexDump string, got []byte) bool
        return assert.Equal(t, wantHexDump, hex.Dump(clean))
 }
 
        return assert.Equal(t, wantHexDump, hex.Dump(clean))
 }
 

-// tranAssertEqual compares equality of transactions slices after stripping out the random ID
+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 {
 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 {
                var fs []Field
                for _, field := range trans.Fields {

-                       if bytes.Equal(field.ID, []byte{0x00, 0x6b}) {
+                       if field.ID == [2]byte{0x00, 0x6b} { // FieldRefNum
+                               continue
+                       }
+                       if field.ID == [2]byte{0x00, 0x72} { // FieldChatID

                                continue
                        }
                        fs = append(fs, field)
                                continue
                        }
                        fs = append(fs, field)


@@ -64,10 +62,13 @@ func tranAssertEqual(t *testing.T, tran1, tran2 []Transaction) bool {
        }
 
        for _, trans := range tran2 {
        }
 
        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 {
                var fs []Field
                for _, field := range trans.Fields {

-                       if bytes.Equal(field.ID, []byte{0x00, 0x6b}) {
+                       if field.ID == [2]byte{0x00, 0x6b} { // FieldRefNum
+                               continue
+                       }
+                       if field.ID == [2]byte{0x00, 0x72} { // FieldChatID

                                continue
                        }
                        fs = append(fs, field)
                                continue
                        }
                        fs = append(fs, field)


@@ -76,5 +77,8 @@ func tranAssertEqual(t *testing.T, tran1, tran2 []Transaction) bool {
                newT2 = append(newT2, trans)
        }
 
                newT2 = append(newT2, trans)
        }
 

+       slices.SortFunc(newT1, tranSortFunc)
+       slices.SortFunc(newT2, tranSortFunc)
+

        return assert.Equal(t, newT1, newT2)
 }
        return assert.Equal(t, newT1, newT2)
 }