improve tests

1 files changed, 26 insertions, 23 deletions

diff --git a/fs_test.go b/fs_test.go
index 7752858..f86be50 100644
--- a/fs_test.go
+++ b/fs_test.go
@@ -79,7 +79,7 @@ func TestFsWriteFile(t *testing.T) {
 	afs, cleanup := newTestAfs()
 	defer cleanup()
 
-	err := afs.WriteFile("dir/file", testdata, 0)
+	err := afs.WriteFile("dir/file.txt", testdata, 0)
 	is.NoErr(err)
 }
 
@@ -88,13 +88,13 @@ func TestFsWriteError(t *testing.T) {
 	afs, cleanup := newTestAfs()
 	defer cleanup()
 
-	f, err := afs.Fs.Create("dir/file")
+	f, err := afs.Fs.Create("dir/file.txt")
 	is.NoErr(err)
 	_, err = f.Write(testdata)
 	is.NoErr(err)
 	err = f.(*File).CloseWriterWithError(errors.New("disk died"))
 	is.NoErr(err)
-	_, err = afs.Stat("dir/file")
+	_, err = afs.Stat("dir/file.txt")
 	is.Equal(err, os.ErrNotExist)
 }
 
@@ -103,14 +103,14 @@ func TestFsWrite17MB(t *testing.T) {
 	afs, cleanup := newTestAfs()
 	defer cleanup()
 
-	f, err := afs.Fs.Create("dir/file")
+	f, err := afs.Fs.Create("dir/file.txt")
 	is.NoErr(err)
 	r := io.LimitReader(cryptorand.Reader, 17*(1<<20))
 	_, err = io.Copy(f, r)
 	is.NoErr(err)
 	err = f.Close()
 	is.NoErr(err)
-	info, err := afs.Stat("dir/file")
+	info, err := afs.Stat("dir/file.txt")
 	is.NoErr(err)
 	is.Equal(info.Size(), int64(17*(1<<20)))
 }
@@ -121,11 +121,11 @@ func TestFsStat(t *testing.T) {
 	defer cleanup()
 
 	var err error
-	err = afs.WriteFile("dir/file", testdata, 0)
+	err = afs.WriteFile("dir/file.txt", testdata, 0)
 	is.NoErr(err)
-	info, err := afs.Stat("dir/file")
+	info, err := afs.Stat("dir/file.txt")
 	is.NoErr(err)
-	is.Equal(info.Name(), "file")
+	is.Equal(info.Name(), "file.txt")
 	is.Equal(info.Size(), int64(8))
 }
 
@@ -145,9 +145,9 @@ func TestFsReadFile(t *testing.T) {
 	defer cleanup()
 
 	var err error
-	err = afs.WriteFile("dir/file", testdata, 0)
+	err = afs.WriteFile("dir/file.txt", testdata, 0)
 	is.NoErr(err)
-	b, err := afs.ReadFile("dir/file")
+	b, err := afs.ReadFile("dir/file.txt")
 	is.NoErr(err)
 	is.Equal(b, testdata)
 }
@@ -167,8 +167,18 @@ func TestFsRemove(t *testing.T) {
 	afs, cleanup := newTestAfs()
 	defer cleanup()
 
-	err := afs.Remove("dir/file")
+	var err error
+	err = afs.WriteFile("dir/file.txt", testdata, 0)
+	is.NoErr(err)
+
+	_, err = afs.ReadFile("dir/file.txt")
+	is.NoErr(err)
+
+	err = afs.Remove("dir/file.txt")
 	is.NoErr(err)
+
+	_, err = afs.ReadFile("dir/file.txt")
+	is.Equal(err, afero.ErrFileNotFound)
 }
 
 func TestFsRemoveNoExist(t *testing.T) {
@@ -176,7 +186,11 @@ func TestFsRemoveNoExist(t *testing.T) {
 	afs, cleanup := newTestAfs()
 	defer cleanup()
 
-	err := afs.Remove("non-existent")
+	var err error
+	_, err = afs.ReadFile("non-existent")
+	is.Equal(err, afero.ErrFileNotFound)
+
+	err = afs.Remove("non-existent")
 	is.NoErr(err)
 }
 
@@ -247,17 +261,6 @@ func TestFsReadDir(t *testing.T) {
 	is.Equal(names, []string{"subdir/"})
 }
 
-func newTestAfs() (*afero.Afero, func()) {
-	fs, err := NewFsFromURL("http://testuser:[email protected]:9000/test-bucket")
-	if err != nil {
-		panic("unexpected error")
-	}
-	afs := &afero.Afero{Fs: fs}
-	return afs, func() {
-		afs.RemoveAll("/")
-	}
-}
-
 func testListBuckets(fs *Fs) ([]string, error) {
 	ctx, cancel := fs.contextWithTimeout()
 	defer cancel()