diff --git a/commands/http/multifilereader_test.go b/commands/http/multifilereader_test.go index fc0309e93..4822e8e6b 100644 --- a/commands/http/multifilereader_test.go +++ b/commands/http/multifilereader_test.go @@ -6,20 +6,20 @@ import ( "strings" "testing" - cmds "github.com/jbenet/go-ipfs/commands" + files "github.com/jbenet/go-ipfs/commands/files" ) func TestOutput(t *testing.T) { text := "Some text! :)" - files := []cmds.File{ - &cmds.ReaderFile{"file.txt", strings.NewReader(text)}, - &cmds.SliceFile{"boop", []cmds.File{ - &cmds.ReaderFile{"boop/a.txt", strings.NewReader("bleep")}, - &cmds.ReaderFile{"boop/b.txt", strings.NewReader("bloop")}, + fileset := []files.File{ + &files.ReaderFile{"file.txt", strings.NewReader(text)}, + &files.SliceFile{"boop", []files.File{ + &files.ReaderFile{"boop/a.txt", strings.NewReader("bleep")}, + &files.ReaderFile{"boop/b.txt", strings.NewReader("bloop")}, }}, - &cmds.ReaderFile{"beep.txt", strings.NewReader("beep")}, + &files.ReaderFile{"beep.txt", strings.NewReader("beep")}, } - sf := &cmds.SliceFile{"", files} + sf := &files.SliceFile{"", fileset} buf := make([]byte, 20) // testing output by reading it with the go stdlib "mime/multipart" Reader @@ -30,7 +30,7 @@ func TestOutput(t *testing.T) { if part == nil || err != nil { t.Error("Expected non-nil part, nil error") } - mpf, err := cmds.NewFileFromPart(part) + mpf, err := files.NewFileFromPart(part) if mpf == nil || err != nil { t.Error("Expected non-nil MultipartFile, nil error") } @@ -51,7 +51,7 @@ func TestOutput(t *testing.T) { if part == nil || err != nil { t.Error("Expected non-nil part, nil error") } - mpf, err = cmds.NewFileFromPart(part) + mpf, err = files.NewFileFromPart(part) if mpf == nil || err != nil { t.Error("Expected non-nil MultipartFile, nil error") } @@ -93,7 +93,7 @@ func TestOutput(t *testing.T) { if part == nil || err != nil { t.Error("Expected non-nil part, nil error") } - mpf, err = cmds.NewFileFromPart(part) + mpf, err = files.NewFileFromPart(part) if mpf == nil || err != nil { t.Error("Expected non-nil MultipartFile, nil error") }