Start moving file io into mockable interface

diff --git a/hotline/file_store.go b/hotline/file_store.go
index 81c1f059d15a2473638ea431cc606233b4a41852..b56d9a180140fb0d643430b6bb5123772a704927 100644 (file)
--- a/hotline/file_store.go
+++ b/hotline/file_store.go
@@ -9,10 +9,9 @@ var FS FileStore
 
 type FileStore interface {
        Mkdir(name string, perm os.FileMode) error
 
 type FileStore interface {
        Mkdir(name string, perm os.FileMode) error

-

        Stat(name string) (os.FileInfo, error)
        Stat(name string) (os.FileInfo, error)

-       // TODO: implement
-
+       Open(name string) (*os.File, error)
+       // TODO: implement these

        //Rename(oldpath string, newpath string) error
        //RemoveAll(path string) error
 }
        //Rename(oldpath string, newpath string) error
        //RemoveAll(path string) error
 }


@@ -27,6 +26,10 @@ func (fs OSFileStore) Stat(name string) (os.FileInfo, error) {
        return os.Stat(name)
 }
 
        return os.Stat(name)
 }
 

+func (fs OSFileStore) Open(name string) (*os.File, error) {
+       return os.Open(name)
+}
+

 type MockFileStore struct {
        mock.Mock
 }
 type MockFileStore struct {
        mock.Mock
 }


@@ -38,9 +41,14 @@ func (mfs MockFileStore) Mkdir(name string, perm os.FileMode) error {
 
 func (mfs MockFileStore) Stat(name string) (os.FileInfo, error) {
        args := mfs.Called(name)
 
 func (mfs MockFileStore) Stat(name string) (os.FileInfo, error) {
        args := mfs.Called(name)

-       if  args.Get(0) == nil {
+       if args.Get(0) == nil {

                return nil, args.Error(1)
 
        }
        return args.Get(0).(os.FileInfo), args.Error(1)
 }
                return nil, args.Error(1)
 
        }
        return args.Get(0).(os.FileInfo), args.Error(1)
 }

+
+func (mfs MockFileStore) Open(name string) (*os.File, error) {
+       args := mfs.Called(name)
+       return args.Get(0).(*os.File), args.Error(1)
+}

diff --git a/hotline/server.go b/hotline/server.go
index 2ee31cf610627dc66956d04f1a1f74852e9315f8..30121a6f1479432d3fdcac0ba55a6a2db135ee23 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -413,7 +413,7 @@ func (s *Server) loadAccounts(userDir string) error {
        }
 
        for _, file := range matches {
        }
 
        for _, file := range matches {

-               fh, err := os.Open(file)
+               fh, err := FS.Open(file)

                if err != nil {
                        return err
                }
                if err != nil {
                        return err
                }


@@ -431,7 +431,7 @@ func (s *Server) loadAccounts(userDir string) error {
 }
 
 func (s *Server) loadConfig(path string) error {
 }
 
 func (s *Server) loadConfig(path string) error {

-       fh, err := os.Open(path)
+       fh, err := FS.Open(path)

        if err != nil {
                return err
        }
        if err != nil {
                return err
        }


@@ -830,7 +830,7 @@ func (s *Server) TransferFile(conn net.Conn) error {
                                return err
                        }
 
                                return err
                        }
 

-                       file, err := os.Open(path)
+                       file, err := FS.Open(path)

                        if err != nil {
                                return err
                        }
                        if err != nil {
                                return err
                        }