Disconnect banned users earlier in the login flow

[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..274ca2b1831ef5552f704d56739cc945d077c6f9 100644 (file)
--- a/hotline/flattened_file_object_test.go
+++ b/hotline/flattened_file_object_test.go
@@ -1,94 +1,43 @@
 package hotline
 
 import (
-       "bytes"
-       "encoding/hex"
-       "github.com/davecgh/go-spew/spew"
-       "reflect"
+       "fmt"
+       "github.com/stretchr/testify/assert"
        "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) {
+func TestFlatFileInformationFork_UnmarshalBinary(t *testing.T) {
        type args struct {
-               filePath string
-               fileName string
+               b []byte
        }
        tests := []struct {
                name    string
                args    args
-               want    *flattenedFileObject
-               wantErr bool
+               wantErr assert.ErrorAssertionFunc
        }{
                {
-                       name: "when file path is valid",
+                       name: "when zero length comment size is omitted (Nostalgia client behavior)",
                        args: args{
-                               filePath: "./test/config/Files/",
-                               fileName: "testfile.txt",
-                       },
-                       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},
+                               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: false,
+                       wantErr: assert.NoError,
                },
                {
-                       name: "when file path is invalid",
+                       name: "when zero length comment size is included",
                        args: args{
-                               filePath: "./nope/",
-                               fileName: "also-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: true,
+                       wantErr: assert.NoError,
                },
        }
        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)
-                               return
-                       }
-                       if !reflect.DeepEqual(got, tt.want) {
-                               t.Errorf("NewFlattenedFileObject() got = %v, want %v", got, tt.want)
-                       }
+                       ffif := &FlatFileInformationFork{}
+                       tt.wantErr(t, ffif.UnmarshalBinary(tt.args.b), fmt.Sprintf("Write(%v)", tt.args.b))
                })
        }
-}
\ No newline at end of file
+}