X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/16a4ad707a05df25c9d12b8cc89fb3a9e3be0dba..6610ee2030baa99e6129c7b06588d33038dde671:/hotline/flattened_file_object_test.go

diff --git a/hotline/flattened_file_object_test.go b/hotline/flattened_file_object_test.go
index 9a57e7e..274ca2b 100644
--- a/hotline/flattened_file_object_test.go
+++ b/hotline/flattened_file_object_test.go
@@ -3,65 +3,41 @@ package hotline
 import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
-	"os"
 	"testing"
 )
 
-func TestNewFlattenedFileObject(t *testing.T) {
+func TestFlatFileInformationFork_UnmarshalBinary(t *testing.T) {
 	type args struct {
-		fileRoot string
-		filePath []byte
-		fileName []byte
+		b []byte
 	}
 	tests := []struct {
 		name    string
 		args    args
-		want    *flattenedFileObject
 		wantErr assert.ErrorAssertionFunc
 	}{
 		{
-			name: "with valid file",
+			name: "when zero length comment size is omitted (Nostalgia client behavior)",
 			args: args{
-				fileRoot: func() string { path, _ := os.Getwd(); return path + "/test/config/Files" }(),
-				fileName: []byte("testfile.txt"),
-				filePath: []byte{0, 0},
-			},
-			want: &flattenedFileObject{
-				FlatFileHeader:                NewFlatFileHeader(),
-				FlatFileInformationForkHeader: FlatFileInformationForkHeader{},
-				FlatFileInformationFork:       NewFlatFileInformationFork("testfile.txt", make([]byte, 8)),
-				FlatFileDataForkHeader: FlatFileDataForkHeader{
-					ForkType:        [4]byte{0x4d, 0x41, 0x43, 0x52}, // DATA
-					CompressionType: [4]byte{0, 0, 0, 0},
-					RSVD:            [4]byte{0, 0, 0, 0},
-					DataSize:        [4]byte{0x00, 0x00, 0x00, 0x17},
+				b: []byte{
+					0x41, 0x4d, 0x41, 0x43, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x62, 0x65, 0x61, 0x72, 0x2e, 0x74, 0x69, 0x66, 0x66,
 				},
-				FileData: nil,
 			},
 			wantErr: assert.NoError,
 		},
 		{
-			name: "when file path is invalid",
+			name: "when zero length comment size is included",
 			args: args{
-				fileRoot: func() string { path, _ := os.Getwd(); return path + "/test/config/Files" }(),
-				fileName: []byte("nope.txt"),
+				b: []byte{
+					0x41, 0x4d, 0x41, 0x43, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x62, 0x65, 0x61, 0x72, 0x2e, 0x74, 0x69, 0x66, 0x66, 0x00, 0x00,
+				},
 			},
-			want:    nil,
-			wantErr: assert.Error,
+			wantErr: assert.NoError,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := NewFlattenedFileObject(tt.args.fileRoot, tt.args.filePath, tt.args.fileName, 0)
-			if tt.wantErr(t, err, fmt.Sprintf("NewFlattenedFileObject(%v, %v, %v)", tt.args.fileRoot, tt.args.filePath, tt.args.fileName)) {
-				return
-			}
-
-			// Clear the file timestamp fields to work around problems running the tests in multiple timezones
-			// TODO: revisit how to test this by mocking the stat calls
-			got.FlatFileInformationFork.CreateDate = make([]byte, 8)
-			got.FlatFileInformationFork.ModifyDate = make([]byte, 8)
-			assert.Equalf(t, tt.want, got, "NewFlattenedFileObject(%v, %v, %v)", tt.args.fileRoot, tt.args.filePath, tt.args.fileName)
+			ffif := &FlatFileInformationFork{}
+			tt.wantErr(t, ffif.UnmarshalBinary(tt.args.b), fmt.Sprintf("Write(%v)", tt.args.b))
 		})
 	}
 }