Convert more bespoke methods to io.Reader/io.Writer interfaces

[rbdr/mobius] / hotline / transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 01880f2555ceb6db7aa782cbbc4b1fc8b06028d6..ca1722faa10342ed976806687261b476d9d1667a 100644 (file)
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -5,6 +5,7 @@ import (
        "fmt"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/mock"
+       "io"
        "io/fs"
        "math/rand"
        "os"
@@ -768,7 +769,6 @@ func TestHandleGetFileInfo(t *testing.T) {
                                                NewField(FieldFileName, []byte("testfile.txt")),
                                                NewField(FieldFileTypeString, []byte("Text File")),
                                                NewField(FieldFileCreatorString, []byte("ttxt")),
-                                               NewField(FieldFileComment, []byte{}),
                                                NewField(FieldFileType, []byte("TEXT")),
                                                NewField(FieldFileCreateDate, make([]byte, 8)),
                                                NewField(FieldFileModifyDate, make([]byte, 8)),
@@ -791,8 +791,8 @@ func TestHandleGetFileInfo(t *testing.T) {
 
                        // Clear the fileWrapper timestamp fields to work around problems running the tests in multiple timezones
                        // TODO: revisit how to test this by mocking the stat calls
+                       gotRes[0].Fields[4].Data = make([]byte, 8)
                        gotRes[0].Fields[5].Data = make([]byte, 8)
-                       gotRes[0].Fields[6].Data = make([]byte, 8)
                        if !assert.Equal(t, tt.wantRes, gotRes) {
                                t.Errorf("HandleGetFileInfo() gotRes = %v, want %v", gotRes, tt.wantRes)
                        }
@@ -1405,7 +1405,7 @@ func TestHandleGetUser(t *testing.T) {
                                        ErrorCode: []byte{0, 0, 0, 0},
                                        Fields: []Field{
                                                NewField(FieldUserName, []byte("Guest")),
-                                               NewField(FieldUserLogin, negateString([]byte("guest"))),
+                                               NewField(FieldUserLogin, encodeString([]byte("guest"))),
                                                NewField(FieldUserPassword, []byte("password")),
                                                NewField(FieldUserAccess, []byte{0, 0, 0, 0, 0, 0, 0, 0}),
                                        },
@@ -1533,7 +1533,7 @@ func TestHandleDeleteUser(t *testing.T) {
                                },
                                t: NewTransaction(
                                        TranDeleteUser, &[]byte{0, 1},
-                                       NewField(FieldUserLogin, negateString([]byte("testuser"))),
+                                       NewField(FieldUserLogin, encodeString([]byte("testuser"))),
                                ),
                        },
                        wantRes: []Transaction{
@@ -1564,7 +1564,7 @@ func TestHandleDeleteUser(t *testing.T) {
                                },
                                t: NewTransaction(
                                        TranDeleteUser, &[]byte{0, 1},
-                                       NewField(FieldUserLogin, negateString([]byte("testuser"))),
+                                       NewField(FieldUserLogin, encodeString([]byte("testuser"))),
                                ),
                        },
                        wantRes: []Transaction{
@@ -2438,7 +2438,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
                                        },
                                },
                        },
-                       wantErr: assert.NoError,
+                       wantErr: assert.Error,
                },
                {
                        name: "when client 1 sends a message to client 2",
@@ -2860,7 +2860,7 @@ func TestHandleGetFileNameList(t *testing.T) {
                                                                        },
                                                                        name: []byte("testfile-1k"),
                                                                }
-                                                               b, _ := fnwi.MarshalBinary()
+                                                               b, _ := io.ReadAll(&fnwi)
                                                                return b
                                                        }(),
                                                ),
@@ -3191,7 +3191,7 @@ func TestHandleDelNewsItem(t *testing.T) {
                                        Server: &Server{
                                                ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
                                                        "test": {
-                                                               Type:     []byte{0, 3},
+                                                               Type:     [2]byte{0, 3},
                                                                Count:    nil,
                                                                NameSize: 0,
                                                                Name:     "zz",
@@ -3237,7 +3237,7 @@ func TestHandleDelNewsItem(t *testing.T) {
                                        Server: &Server{
                                                ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
                                                        "testcat": {
-                                                               Type:     []byte{0, 2},
+                                                               Type:     [2]byte{0, 2},
                                                                Count:    nil,
                                                                NameSize: 0,
                                                                Name:     "test",
@@ -3293,7 +3293,7 @@ func TestHandleDelNewsItem(t *testing.T) {
                                                }(),
                                                ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
                                                        "testcat": {
-                                                               Type:     []byte{0, 2},
+                                                               Type:     [2]byte{0, 2},
                                                                Count:    nil,
                                                                NameSize: 0,
                                                                Name:     "test",
@@ -3847,7 +3847,7 @@ func TestHandleNewNewsFldr(t *testing.T) {
                                                }(),
                                                ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
                                                        "test": {
-                                                               Type:     []byte{0, 2},
+                                                               Type:     [2]byte{0, 2},
                                                                Count:    nil,
                                                                NameSize: 0,
                                                                Name:     "test",