X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/67d1f7231b807771b57c8f0e63dd796a03130eaf..1c7401b16230f9834469127945d9c506919bed14:/hotline/transaction_handlers_test.go?ds=sidebyside diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go index 751590e..89ee9fc 100644 --- a/hotline/transaction_handlers_test.go +++ b/hotline/transaction_handlers_test.go @@ -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", @@ -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")), }, @@ -3781,7 +3779,6 @@ func TestHandleGetNewsArtNameList(t *testing.T) { return } tranAssertEqual(t, tt.wantRes, gotRes) - }) } } @@ -3942,7 +3939,7 @@ func TestHandleNewNewsFldr(t *testing.T) { // }, // }, // wantErr: assert.Error, - //}, + // }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) {