Misc cleanup

[rbdr/mobius] / hotline / flattened_file_object_test.go

diff --git a/hotline/flattened_file_object_test.go b/hotline/flattened_file_object_test.go
index 19b7c94afbbb22da78f7b7d5918a0e511cbea5cc..12b6d32c260fe45696ff16b4e1dd728970f7c9d4 100644 (file)
--- a/hotline/flattened_file_object_test.go
+++ b/hotline/flattened_file_object_test.go
@@ -3,8 +3,9 @@ package hotline
 import (
        "bytes"
        "encoding/hex"
-       "github.com/davecgh/go-spew/spew"
-       "reflect"
+       "fmt"
+       "github.com/stretchr/testify/assert"
+       "os"
        "testing"
 )
 
@@ -20,75 +21,125 @@ func TestReadFlattenedFileObject(t *testing.T) {
        }
 }
 
-//
-//func TestNewFlattenedFileObject(t *testing.T) {
-//     ffo := NewFlattenedFileObject("test/config/files", "testfile.txt")
-//
-//     dataSize := ffo.FlatFileDataForkHeader.DataSize
-//     want := []byte{0, 0, 0, 0x17}
-//     if bytes.Compare(dataSize, want) != 0 {
-//             t.Errorf("%q, want %q", dataSize, want)
-//     }
-//
-//     comment := ffo.FlatFileInformationFork.Comment
-//     want = []byte("Test Comment")
-//     if bytes.Compare(ffo.FlatFileInformationFork.Comment, want) != 0 {
-//             t.Errorf("%q, want %q", comment, want)
-//     }
-//}
-
 func TestNewFlattenedFileObject(t *testing.T) {
        type args struct {
-               filePath string
-               fileName string
+               fileRoot string
+               filePath []byte
+               fileName []byte
        }
        tests := []struct {
                name    string
                args    args
                want    *flattenedFileObject
-               wantErr bool
+               wantErr assert.ErrorAssertionFunc
        }{
                {
-                       name: "when file path is valid",
+                       name: "with valid file",
                        args: args{
-                               filePath: "./test/config/Files/",
-                               fileName: "testfile.txt",
+                               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"),
-                               FlatFileDataForkHeader:        FlatFileDataForkHeader{
+                               FlatFileInformationFork:       NewFlatFileInformationFork("testfile.txt", make([]byte, 8)),
+                               FlatFileDataForkHeader: FlatFileDataForkHeader{
                                        ForkType:        []byte("DATA"),
                                        CompressionType: []byte{0, 0, 0, 0},
                                        RSVD:            []byte{0, 0, 0, 0},
                                        DataSize:        []byte{0x00, 0x00, 0x00, 0x17},
                                },
-                               FileData:                      nil,
+                               FileData: nil,
                        },
-                       wantErr: false,
+                       wantErr: assert.NoError,
                },
                {
                        name: "when file path is invalid",
                        args: args{
-                               filePath: "./nope/",
-                               fileName: "also-nope.txt",
+                               fileRoot: func() string { path, _ := os.Getwd(); return path + "/test/config/Files" }(),
+                               fileName: []byte("nope.txt"),
                        },
-                       want: nil,
-                       wantErr: true,
+                       want:    nil,
+                       wantErr: assert.Error,
                },
        }
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
-                       got, err := NewFlattenedFileObject(tt.args.filePath, tt.args.fileName)
-                       spew.Dump(got)
-                       if (err != nil) != tt.wantErr {
-                               t.Errorf("NewFlattenedFileObject() error = %v, wantErr %v", err, tt.wantErr)
+                       got, err := NewFlattenedFileObject(tt.args.fileRoot, tt.args.filePath, tt.args.fileName)
+                       if tt.wantErr(t, err, fmt.Sprintf("NewFlattenedFileObject(%v, %v, %v)", tt.args.fileRoot, tt.args.filePath, tt.args.fileName)) {
                                return
                        }
-                       if !reflect.DeepEqual(got, tt.want) {
-                               t.Errorf("NewFlattenedFileObject() got = %v, want %v", got, tt.want)
+
+                       // 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)
+               })
+       }
+}
+
+func Test_flattenedFileObject_BinaryMarshal(t *testing.T) {
+
+       testData, _ := hex.DecodeString("46494c500001000000000000000000000000000000000002494e464f000000000000000000000052414d414354455854747478740000000000000100000000000000000000000000000000000000000000000000000000000000000007700000ba74247307700000ba74247300000008746573742e74787400004441544100000000000000000000000474657374")
+       testFile := ReadFlattenedFileObject(testData)
+       testFile.FlatFileInformationFork.Comment = []byte("test!")
+       testFile.FlatFileInformationFork.CommentSize = []byte{0x00, 0x05}
+
+       type fields struct {
+               FlatFileHeader                FlatFileHeader
+               FlatFileInformationForkHeader FlatFileInformationForkHeader
+               FlatFileInformationFork       FlatFileInformationFork
+               FlatFileDataForkHeader        FlatFileDataForkHeader
+               FileData                      []byte
+       }
+       tests := []struct {
+               name   string
+               fields fields
+               want   []byte
+       }{
+               {
+                       name: "with a valid file",
+                       fields: fields{
+                               FlatFileHeader:                testFile.FlatFileHeader,
+                               FlatFileInformationForkHeader: testFile.FlatFileInformationForkHeader,
+                               FlatFileInformationFork:       testFile.FlatFileInformationFork,
+                               FlatFileDataForkHeader:        testFile.FlatFileDataForkHeader,
+                               FileData:                      testFile.FileData,
+                       },
+                       want: []byte{
+                               0x46, 0x49, 0x4c, 0x50, 0x00, 0x01, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+                               0x49, 0x4e, 0x46, 0x4f, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57,
+                               0x41, 0x4d, 0x41, 0x43, 0x54, 0x45, 0x58, 0x54,
+                               0x74, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x01, 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, 0x07, 0x70, 0x00, 0x00,
+                               0xba, 0x74, 0x24, 0x73, 0x07, 0x70, 0x00, 0x00,
+                               0xba, 0x74, 0x24, 0x73, 0x00, 0x00, 0x00, 0x08,
+                               0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, 0x78, 0x74,
+                               0x00, 0x05, 0x74, 0x65, 0x73, 0x74, 0x21, 0x44,
+                               0x41, 0x54, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+                       },
+               },
+       }
+       for _, tt := range tests {
+               t.Run(tt.name, func(t *testing.T) {
+                       f := flattenedFileObject{
+                               FlatFileHeader:                tt.fields.FlatFileHeader,
+                               FlatFileInformationForkHeader: tt.fields.FlatFileInformationForkHeader,
+                               FlatFileInformationFork:       tt.fields.FlatFileInformationFork,
+                               FlatFileDataForkHeader:        tt.fields.FlatFileDataForkHeader,
+                               FileData:                      tt.fields.FileData,
                        }
+                       assert.Equalf(t, tt.want, f.BinaryMarshal(), "BinaryMarshal()")
                })
        }
-}
\ No newline at end of file
+}