From 2fe642ac619bf8f327593715f24f3399489cd85a Mon Sep 17 00:00:00 2001 From: LordMathis Date: Tue, 19 Nov 2024 21:43:52 +0100 Subject: [PATCH] Rework mock filesystem --- server/go.mod | 4 - server/internal/storage/filesystem_test.go | 129 +++++++++++++++++---- server/internal/storage/service_test.go | 12 -- 3 files changed, 104 insertions(+), 41 deletions(-) delete mode 100644 server/internal/storage/service_test.go diff --git a/server/go.mod b/server/go.mod index 90ae840..0af2cf4 100644 --- a/server/go.mod +++ b/server/go.mod @@ -11,7 +11,6 @@ require ( github.com/golang-jwt/jwt/v5 v5.2.1 github.com/google/uuid v1.6.0 github.com/mattn/go-sqlite3 v1.14.23 - github.com/stretchr/testify v1.9.0 github.com/unrolled/secure v1.17.0 golang.org/x/crypto v0.21.0 ) @@ -23,7 +22,6 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect @@ -35,7 +33,6 @@ require ( github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/skeema/knownhosts v1.2.2 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect @@ -45,5 +42,4 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.13.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/server/internal/storage/filesystem_test.go b/server/internal/storage/filesystem_test.go index 3e51dca..238fc52 100644 --- a/server/internal/storage/filesystem_test.go +++ b/server/internal/storage/filesystem_test.go @@ -1,46 +1,125 @@ package storage_test import ( + "errors" "io/fs" - "os" - "testing/fstest" + "path/filepath" + "time" ) -// MapFS adapts testing.MapFS to implement our fileSystem interface -type MapFS struct { - fstest.MapFS +type mockDirEntry struct { + name string + isDir bool } -func NewMapFS() *MapFS { - return &MapFS{ - MapFS: make(fstest.MapFS), +func (m *mockDirEntry) Name() string { return m.name } +func (m *mockDirEntry) IsDir() bool { return m.isDir } +func (m *mockDirEntry) Type() fs.FileMode { return fs.ModeDir } +func (m *mockDirEntry) Info() (fs.FileInfo, error) { return nil, nil } + +func NewMockDirEntry(name string, isDir bool) fs.DirEntry { + return &mockDirEntry{name: name, isDir: isDir} +} + +// Extend mockFS to support directory operations +type MockDirInfo struct { + name string + size int64 + mode fs.FileMode + modTime time.Time + isDir bool +} + +func (m MockDirInfo) Name() string { return m.name } +func (m MockDirInfo) Size() int64 { return m.size } +func (m MockDirInfo) Mode() fs.FileMode { return m.mode } +func (m MockDirInfo) ModTime() time.Time { return m.modTime } +func (m MockDirInfo) IsDir() bool { return m.isDir } +func (m MockDirInfo) Sys() interface{} { return nil } + +type mockFS struct { + // Record operations for verification + ReadCalls map[string]int + WriteCalls map[string][]byte + RemoveCalls []string + MkdirCalls []string + + // Configure test behavior + ReadFileReturns map[string]struct { + data []byte + err error + } + ReadDirReturns map[string]struct { + entries []fs.DirEntry + err error + } + WriteFileError error + RemoveError error + MkdirError error + StatError error +} + +func NewMockFS() *mockFS { + return &mockFS{ + ReadCalls: make(map[string]int), + WriteCalls: make(map[string][]byte), + RemoveCalls: make([]string, 0), + MkdirCalls: make([]string, 0), + ReadFileReturns: make(map[string]struct { + data []byte + err error + }), } } -// Only implement the methods that MapFS doesn't already provide -func (m *MapFS) WriteFile(path string, data []byte, perm fs.FileMode) error { - m.MapFS[path] = &fstest.MapFile{ - Data: data, - Mode: perm, +func (m *mockFS) ReadFile(path string) ([]byte, error) { + m.ReadCalls[path]++ + if ret, ok := m.ReadFileReturns[path]; ok { + return ret.data, ret.err } - return nil + return nil, errors.New("file not found") } -func (m *MapFS) Remove(path string) error { - delete(m.MapFS, path) - return nil +func (m *mockFS) WriteFile(path string, data []byte, _ fs.FileMode) error { + m.WriteCalls[path] = data + return m.WriteFileError } -func (m *MapFS) MkdirAll(_ string, _ fs.FileMode) error { - // For MapFS, we don't actually need to create directories - return nil +func (m *mockFS) Remove(path string) error { + m.RemoveCalls = append(m.RemoveCalls, path) + return m.RemoveError } -func (m *MapFS) RemoveAll(path string) error { - delete(m.MapFS, path) - return nil +func (m *mockFS) MkdirAll(path string, _ fs.FileMode) error { + m.MkdirCalls = append(m.MkdirCalls, path) + return m.MkdirError } -func (m *MapFS) IsNotExist(err error) bool { - return os.IsNotExist(err) +func (m *mockFS) Stat(path string) (fs.FileInfo, error) { + if m.StatError != nil { + return nil, m.StatError + } + return MockDirInfo{ + name: filepath.Base(path), + size: 1024, + mode: 0644, + modTime: time.Now(), + isDir: false, + }, nil +} + +func (m *mockFS) ReadDir(path string) ([]fs.DirEntry, error) { + if ret, ok := m.ReadDirReturns[path]; ok { + return ret.entries, ret.err + } + return nil, fs.ErrNotExist +} + +func (m *mockFS) RemoveAll(path string) error { + m.RemoveCalls = append(m.RemoveCalls, path) + return m.RemoveError +} + +func (m *mockFS) IsNotExist(err error) bool { + return err == fs.ErrNotExist } diff --git a/server/internal/storage/service_test.go b/server/internal/storage/service_test.go deleted file mode 100644 index 696f90d..0000000 --- a/server/internal/storage/service_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package storage_test - -import ( - "novamd/internal/storage" - "testing" -) - -func SetupTestService(t *testing.T) (*storage.Service, *MapFS) { - fs := &MapFS{} - srv := storage.NewServiceWithFS("/test/root", fs) - return srv, fs -}