Add NewReader unit tests

storage/filestorage.go

@@ -3,7 +3,6 @@ package storage
 import (
 	"crypto"
 	"io"
-	"log"
 	"os"
 	"path"
 
@@ -22,25 +21,24 @@ func NewFileStorage(directory string) Storage {
 
 // NewReader returns a Reader for a file in a location, returns ErrFileNotFound
 // if the requested path was not found at all
-func (s *FileStorage) NewReader(filename string, location Location) (reader io.ReadCloser, err error) {
+func (s *FileStorage) NewReader(filename string, location Location) (io.ReadCloser, error) {
 	var prefix string
 	if location == Permanent {
 		prefix = ""
 	} else {
 		prefix = "-in-progress"
 	}
+
 	fullPath := path.Join(s.directory+prefix, filename)
 	stat, err := os.Stat(fullPath)
 	if os.IsNotExist(err) || stat == nil {
-		err = ErrFileNotFound
-		return
+		return nil, ErrFileNotFound
 	}
 
 	f, err := os.Open(fullPath)
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
-
 	return f, err
 }
 

storage/filestorage_test.go

@@ -0,0 +1,41 @@
+package storage
+
+import (
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	testdataDir   = "testdata/testrepo"
+	inProgressDir = "testdata/testrepo-in-progress"
+	testFile      = "test.txt"
+)
+
+func TestNewReader(t *testing.T) {
+	tests := []struct {
+		name      string
+		directory string
+		filename  string
+		location  Location
+		wantErr   bool
+	}{
+		{"Permanent location", testdataDir, testFile, Permanent, false},
+		{"Temporary location", testdataDir, testFile, Temporary, false},
+		{"Not existing file", testdataDir, "does-not-exist.txt", Permanent, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			storage := NewFileStorage(tt.directory)
+
+			r, err := storage.NewReader(tt.filename, tt.location)
+			assert.EqualValues(t, tt.wantErr, (err != nil))
+			if r != nil {
+				content, err := io.ReadAll(r)
+				assert.Nil(t, err)
+				assert.EqualValues(t, "Hello World", string(content))
+			}
+		})
+	}
+}

storage/testdata/testrepo-in-progress/test.txt

@@ -0,0 +1 @@
+Hello World

storage/testdata/testrepo/test.txt

@@ -0,0 +1 @@
+Hello World