X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/67d1f7231b807771b57c8f0e63dd796a03130eaf..e995052ef530b1eae2d0476ff519f7225bbb481d:/hotline/transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 751590e..ca1722f 100644
--- 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)
 			}
@@ -1056,7 +1056,6 @@ func TestHandleNewFolder(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			gotRes, err := HandleNewFolder(tt.args.cc, tt.args.t)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("HandleNewFolder() error = %v, wantErr %v", err, tt.wantErr)
@@ -1175,7 +1174,6 @@ func TestHandleUploadFile(t *testing.T) {
 			}
 
 			tranAssertEqual(t, tt.wantRes, gotRes)
-
 		})
 	}
 }
@@ -1407,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}),
 					},
@@ -1535,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{
@@ -1566,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{
@@ -2440,7 +2438,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					},
 				},
 			},
-			wantErr: assert.NoError,
+			wantErr: assert.Error,
 		},
 		{
 			name: "when client 1 sends a message to client 2",
@@ -2862,7 +2860,7 @@ func TestHandleGetFileNameList(t *testing.T) {
 									},
 									name: []byte("testfile-1k"),
 								}
-								b, _ := fnwi.MarshalBinary()
+								b, _ := io.ReadAll(&fnwi)
 								return b
 							}(),
 						),
@@ -2982,7 +2980,7 @@ func TestHandleGetClientInfoText(t *testing.T) {
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
 						NewField(FieldData, []byte(
-							strings.Replace(`Nickname:   Testy McTest
+							strings.ReplaceAll(`Nickname:   Testy McTest
 Name:       test
 Account:    test
 Address:    1.2.3.4:12345
@@ -3007,7 +3005,7 @@ None.
 
 None.
 
-`, "\n", "\r", -1)),
+`, "\n", "\r")),
 						),
 						NewField(FieldUserName, []byte("Testy McTest")),
 					},
@@ -3193,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",
@@ -3239,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",
@@ -3295,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",
@@ -3781,7 +3779,6 @@ func TestHandleGetNewsArtNameList(t *testing.T) {
 				return
 			}
 			tranAssertEqual(t, tt.wantRes, gotRes)
-
 		})
 	}
 }
@@ -3850,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",
@@ -3942,7 +3939,7 @@ func TestHandleNewNewsFldr(t *testing.T) {
 		//		},
 		//	},
 		//	wantErr: assert.Error,
-		//},
+		// },
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {