Delete cmd/mobius-hotline-server/mobius/config/Files/hello.txt

[rbdr/mobius] / hotline / transfer_test.go

diff --git a/hotline/transfer_test.go b/hotline/transfer_test.go
index fb7d39cfa89da66614d2db0797c994dc852ce335..4aa142b08889bb32768b23501cf0fd49cb079f81 100644 (file)
--- a/hotline/transfer_test.go
+++ b/hotline/transfer_test.go
@@ -8,7 +8,7 @@ import (
        "testing"
 )
 
-func TestTransfer_Read(t *testing.T) {
+func TestTransfer_Write(t *testing.T) {
        type fields struct {
                Protocol        [4]byte
                ReferenceNumber [4]byte
@@ -122,20 +122,17 @@ func Test_receiveFile(t *testing.T) {
                                                FlatFileHeader: FlatFileHeader{
                                                        Format:    [4]byte{0x46, 0x49, 0x4c, 0x50}, // "FILP"
                                                        Version:   [2]byte{0, 1},
-                                                       RSVD:      [16]byte{},
                                                        ForkCount: [2]byte{0, 2},
                                                },
                                                FlatFileInformationForkHeader: FlatFileForkHeader{},
-                                               FlatFileInformationFork:       NewFlatFileInformationFork("testfile.txt", make([]byte, 8), "TEXT", "TEXT"),
+                                               FlatFileInformationFork:       NewFlatFileInformationFork("testfile.txt", [8]byte{}, "TEXT", "TEXT"),
                                                FlatFileDataForkHeader: FlatFileForkHeader{
-                                                       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, 0x03},
+                                                       ForkType: [4]byte{0x4d, 0x41, 0x43, 0x52}, // DATA
+                                                       DataSize: [4]byte{0x00, 0x00, 0x00, 0x03},
                                                },
                                        }
                                        fakeFileData := []byte{1, 2, 3}
-                                       b := testFile.BinaryMarshal()
+                                       b, _ := io.ReadAll(&testFile)
                                        b = append(b, fakeFileData...)
                                        return bytes.NewReader(b)
                                }(),
@@ -146,7 +143,7 @@ func Test_receiveFile(t *testing.T) {
                        wantErr: assert.NoError,
                },
                // {
-               //      name: "transfers fileWrapper when there is a resource fork",
+               //      Name: "transfers fileWrapper when there is a resource fork",
                //      args: args{
                //              conn: func() io.Reader {
                //                      testFile := flattenedFileObject{
@@ -188,7 +185,7 @@ func Test_receiveFile(t *testing.T) {
                        targetFile := &bytes.Buffer{}
                        resForkFile := &bytes.Buffer{}
                        infoForkFile := &bytes.Buffer{}
-                       err := receiveFile(tt.args.conn, targetFile, resForkFile, infoForkFile)
+                       err := receiveFile(tt.args.conn, targetFile, resForkFile, infoForkFile, io.Discard)
                        if !tt.wantErr(t, err, fmt.Sprintf("receiveFile(%v, %v, %v)", tt.args.conn, targetFile, resForkFile)) {
                                return
                        }