X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/76d0c1f61d5981603389e6267bf62636f34bef1f..6699cff21c226aa900ed3517c0f7ef3d50cefc17:/hotline/transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 89ee9fc..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)
 			}
@@ -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",