X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d005ef04cfaa26943e6dd33807d741577ffb232a..84f3e842cefd5d56bfad299c9592d836dc13059a:/hotline/transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 751590e..b03e3b1 100644
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -768,7 +768,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 +790,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 +1055,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 +1173,6 @@ func TestHandleUploadFile(t *testing.T) {
 			}
 
 			tranAssertEqual(t, tt.wantRes, gotRes)
-
 		})
 	}
 }
@@ -1407,7 +1404,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 +1532,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 +1563,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 +2437,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					},
 				},
 			},
-			wantErr: assert.NoError,
+			wantErr: assert.Error,
 		},
 		{
 			name: "when client 1 sends a message to client 2",
@@ -2982,7 +2979,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 +3004,7 @@ None.
 
 None.
 
-`, "\n", "\r", -1)),
+`, "\n", "\r")),
 						),
 						NewField(FieldUserName, []byte("Testy McTest")),
 					},
@@ -3781,7 +3778,6 @@ func TestHandleGetNewsArtNameList(t *testing.T) {
 				return
 			}
 			tranAssertEqual(t, tt.wantRes, gotRes)
-
 		})
 	}
 }
@@ -3942,7 +3938,7 @@ func TestHandleNewNewsFldr(t *testing.T) {
 		//		},
 		//	},
 		//	wantErr: assert.Error,
-		//},
+		// },
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {