commands/files: Fixed tests
Matt Bell committed
Jan 13, 2015 at 22:36 UTC
dbb5118d76e6c62529c18e1212741c389e20943c
2 files changed
+10
-8
commands/files/file_test.go
+5
-4
@@ -2,6 +2,7 @@ package files
2
3
import (
4
"io"
5
+ "io/ioutil"
6
"mime/multipart"
7
"strings"
8
"testing"
@@ -10,9 +11,9 @@ import (
11
func TestSliceFiles(t *testing.T) {
12
name := "testname"
13
files := []File{
13
- &ReaderFile{"file.txt", strings.NewReader("Some text!\n")},
14
- &ReaderFile{"beep.txt", strings.NewReader("beep")},
15
- &ReaderFile{"boop.txt", strings.NewReader("boop")},
14
+ &ReaderFile{"file.txt", ioutil.NopCloser(strings.NewReader("Some text!\n"))},
15
+ &ReaderFile{"beep.txt", ioutil.NopCloser(strings.NewReader("beep"))},
16
+ &ReaderFile{"boop.txt", ioutil.NopCloser(strings.NewReader("boop"))},
17
}
18
buf := make([]byte, 20)
19
@@ -54,7 +55,7 @@ func TestSliceFiles(t *testing.T) {
55
56
func TestReaderFiles(t *testing.T) {
57
message := "beep boop"
57
- rf := &ReaderFile{"file.txt", strings.NewReader(message)}
58
+ rf := &ReaderFile{"file.txt", ioutil.NopCloser(strings.NewReader(message))}
59
buf := make([]byte, len(message))
60
61
if rf.IsDirectory() {
commands/http/multifilereader_test.go
+5
-4
@@ -2,6 +2,7 @@ package http
2
3
import (
4
"io"
5
+ "io/ioutil"
6
"mime/multipart"
7
"strings"
8
"testing"
@@ -12,12 +13,12 @@ import (
13
func TestOutput(t *testing.T) {
14
text := "Some text! :)"
15
fileset := []files.File{
15
- &files.ReaderFile{"file.txt", strings.NewReader(text)},
16
+ &files.ReaderFile{"file.txt", ioutil.NopCloser(strings.NewReader(text))},
17
&files.SliceFile{"boop", []files.File{
17
- &files.ReaderFile{"boop/a.txt", strings.NewReader("bleep")},
18
- &files.ReaderFile{"boop/b.txt", strings.NewReader("bloop")},
18
+ &files.ReaderFile{"boop/a.txt", ioutil.NopCloser(strings.NewReader("bleep"))},
19
+ &files.ReaderFile{"boop/b.txt", ioutil.NopCloser(strings.NewReader("bloop"))},
20
}},
20
- &files.ReaderFile{"beep.txt", strings.NewReader("beep")},
21
+ &files.ReaderFile{"beep.txt", ioutil.NopCloser(strings.NewReader("beep"))},
22
}
23
sf := &files.SliceFile{"", fileset}
24
buf := make([]byte, 20)