Improve human readability of account config files

[rbdr/mobius] / hotline / file_name_with_info_test.go

diff --git a/hotline/file_name_with_info_test.go b/hotline/file_name_with_info_test.go
index 3ca2c3089131ba32fce2b8afca42b4d105a3b5d1..5095acf53b37b1ebff950ba0ede5d7305f79bec2 100644 (file)
--- a/hotline/file_name_with_info_test.go
+++ b/hotline/file_name_with_info_test.go
@@ -2,13 +2,13 @@ package hotline
 
 import (
        "github.com/stretchr/testify/assert"
 
 import (
        "github.com/stretchr/testify/assert"

-       "reflect"
+       "io"

        "testing"
 )
 
 func TestFileNameWithInfo_MarshalBinary(t *testing.T) {
        type fields struct {
        "testing"
 )
 
 func TestFileNameWithInfo_MarshalBinary(t *testing.T) {
        type fields struct {

-               fileNameWithInfoHeader fileNameWithInfoHeader
+               fileNameWithInfoHeader FileNameWithInfoHeader

                name                   []byte
        }
        tests := []struct {
                name                   []byte
        }
        tests := []struct {


@@ -20,7 +20,7 @@ func TestFileNameWithInfo_MarshalBinary(t *testing.T) {
                {
                        name: "returns expected bytes",
                        fields: fields{
                {
                        name: "returns expected bytes",
                        fields: fields{

-                               fileNameWithInfoHeader: fileNameWithInfoHeader{
+                               fileNameWithInfoHeader: FileNameWithInfoHeader{

                                        Type:       [4]byte{0x54, 0x45, 0x58, 0x54}, // TEXT
                                        Creator:    [4]byte{0x54, 0x54, 0x58, 0x54}, // TTXT
                                        FileSize:   [4]byte{0x00, 0x43, 0x16, 0xd3}, // File Size
                                        Type:       [4]byte{0x54, 0x45, 0x58, 0x54}, // TEXT
                                        Creator:    [4]byte{0x54, 0x54, 0x58, 0x54}, // TTXT
                                        FileSize:   [4]byte{0x00, 0x43, 0x16, 0xd3}, // File Size


@@ -45,15 +45,15 @@ func TestFileNameWithInfo_MarshalBinary(t *testing.T) {
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
                        f := &FileNameWithInfo{
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
                        f := &FileNameWithInfo{

-                               fileNameWithInfoHeader: tt.fields.fileNameWithInfoHeader,
-                               name:                   tt.fields.name,
+                               FileNameWithInfoHeader: tt.fields.fileNameWithInfoHeader,
+                               Name:                   tt.fields.name,

                        }
                        }

-                       gotData, err := f.MarshalBinary()
+                       gotData, err := io.ReadAll(f)

                        if (err != nil) != tt.wantErr {
                                t.Errorf("MarshalBinary() error = %v, wantErr %v", err, tt.wantErr)
                                return
                        }
                        if (err != nil) != tt.wantErr {
                                t.Errorf("MarshalBinary() error = %v, wantErr %v", err, tt.wantErr)
                                return
                        }

-                       if !reflect.DeepEqual(gotData, tt.wantData) {
+                       if !assert.Equal(t, tt.wantData, gotData) {

                                t.Errorf("MarshalBinary() gotData = %v, want %v", gotData, tt.wantData)
                        }
                })
                                t.Errorf("MarshalBinary() gotData = %v, want %v", gotData, tt.wantData)
                        }
                })


@@ -62,7 +62,7 @@ func TestFileNameWithInfo_MarshalBinary(t *testing.T) {
 
 func TestFileNameWithInfo_UnmarshalBinary(t *testing.T) {
        type fields struct {
 
 func TestFileNameWithInfo_UnmarshalBinary(t *testing.T) {
        type fields struct {

-               fileNameWithInfoHeader fileNameWithInfoHeader
+               fileNameWithInfoHeader FileNameWithInfoHeader

                name                   []byte
        }
        type args struct {
                name                   []byte
        }
        type args struct {


@@ -72,7 +72,7 @@ func TestFileNameWithInfo_UnmarshalBinary(t *testing.T) {
                name    string
                fields  fields
                args    args
                name    string
                fields  fields
                args    args

-               want *FileNameWithInfo
+               want    *FileNameWithInfo

                wantErr bool
        }{
                {
                wantErr bool
        }{
                {


@@ -89,7 +89,7 @@ func TestFileNameWithInfo_UnmarshalBinary(t *testing.T) {
                                },
                        },
                        want: &FileNameWithInfo{
                                },
                        },
                        want: &FileNameWithInfo{

-                               fileNameWithInfoHeader: fileNameWithInfoHeader{
+                               FileNameWithInfoHeader: FileNameWithInfoHeader{

                                        Type:       [4]byte{0x54, 0x45, 0x58, 0x54}, // TEXT
                                        Creator:    [4]byte{0x54, 0x54, 0x58, 0x54}, // TTXT
                                        FileSize:   [4]byte{0x00, 0x43, 0x16, 0xd3}, // File Size
                                        Type:       [4]byte{0x54, 0x45, 0x58, 0x54}, // TEXT
                                        Creator:    [4]byte{0x54, 0x54, 0x58, 0x54}, // TTXT
                                        FileSize:   [4]byte{0x00, 0x43, 0x16, 0xd3}, // File Size


@@ -97,7 +97,7 @@ func TestFileNameWithInfo_UnmarshalBinary(t *testing.T) {
                                        NameScript: [2]byte{0, 0},
                                        NameSize:   [2]byte{0x00, 0x0e},
                                },
                                        NameScript: [2]byte{0, 0},
                                        NameSize:   [2]byte{0x00, 0x0e},
                                },

-                               name: []byte("Audion.app.zip"),
+                               Name: []byte("Audion.app.zip"),

                        },
                        wantErr: false,
                },
                        },
                        wantErr: false,
                },


@@ -105,15 +105,15 @@ func TestFileNameWithInfo_UnmarshalBinary(t *testing.T) {
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
                        f := &FileNameWithInfo{
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
                        f := &FileNameWithInfo{

-                               fileNameWithInfoHeader: tt.fields.fileNameWithInfoHeader,
-                               name:                   tt.fields.name,
+                               FileNameWithInfoHeader: tt.fields.fileNameWithInfoHeader,
+                               Name:                   tt.fields.name,

                        }
                        }

-                       if err := f.UnmarshalBinary(tt.args.data); (err != nil) != tt.wantErr {
-                               t.Errorf("UnmarshalBinary() error = %v, wantErr %v", err, tt.wantErr)
+                       if _, err := f.Write(tt.args.data); (err != nil) != tt.wantErr {
+                               t.Errorf("Write() error = %v, wantErr %v", err, tt.wantErr)

                        }
                        if !assert.Equal(t, tt.want, f) {
                                t.Errorf("Read() got = %v, want %v", f, tt.want)
                        }
                })
        }
                        }
                        if !assert.Equal(t, tt.want, f) {
                                t.Errorf("Read() got = %v, want %v", f, tt.want)
                        }
                })
        }

-}
\ No newline at end of file
+}