minor: v0.4.0

[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..9a57e7ed49211a8403432168bedb85e25d7f591d 100644 (file)
--- a/hotline/flattened_file_object_test.go
+++ b/hotline/flattened_file_object_test.go
@@ -1,94 +1,67 @@
 package hotline
 
 import (
 package hotline
 
 import (

-       "bytes"
-       "encoding/hex"
-       "github.com/davecgh/go-spew/spew"
-       "reflect"
+       "fmt"
+       "github.com/stretchr/testify/assert"
+       "os"

        "testing"
 )
 
        "testing"
 )
 

-func TestReadFlattenedFileObject(t *testing.T) {
-       testData, _ := hex.DecodeString("46494c500001000000000000000000000000000000000002494e464f000000000000000000000052414d414354455854747478740000000000000100000000000000000000000000000000000000000000000000000000000000000007700000ba74247307700000ba74247300000008746573742e74787400004441544100000000000000000000000474657374")
-
-       ffo := ReadFlattenedFileObject(testData)
-
-       format := ffo.FlatFileHeader.Format[:]
-       want := []byte("FILP")
-       if !bytes.Equal(format, want) {
-               t.Errorf("ReadFlattenedFileObject() = %q, want %q", format, want)
-       }
-}
-
-//
-//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 {
 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
        }
        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{
                        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{},
                        },
                        want: &flattenedFileObject{
                                FlatFileHeader:                NewFlatFileHeader(),
                                FlatFileInformationForkHeader: FlatFileInformationForkHeader{},

-                               FlatFileInformationFork:       NewFlatFileInformationFork("testfile.txt"),
-                               FlatFileDataForkHeader:        FlatFileDataForkHeader{
-                                       ForkType:        []byte("DATA"),
-                                       CompressionType: []byte{0, 0, 0, 0},
-                                       RSVD:            []byte{0, 0, 0, 0},
-                                       DataSize:        []byte{0x00, 0x00, 0x00, 0x17},
+                               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},

                                },
                                },

-                               FileData:                      nil,
+                               FileData: nil,

                        },
                        },

-                       wantErr: false,
+                       wantErr: assert.NoError,

                },
                {
                        name: "when file path is invalid",
                        args: args{
                },
                {
                        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) {
                },
        }
        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, 0)
+                       if tt.wantErr(t, err, fmt.Sprintf("NewFlattenedFileObject(%v, %v, %v)", tt.args.fileRoot, tt.args.filePath, tt.args.fileName)) {

                                return
                        }
                                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)

                })
        }
                })
        }

-}
\ No newline at end of file
+}