Remove PrepFakeFiler

cmd/fs/helpers_test.go

@@ -94,9 +94,9 @@ func setupTest(t *testing.T) (*validArgs, *cobra.Command, *mocks.MockWorkspaceCl
 
 	fakeFilerForPath := func(ctx context.Context, fullPath string) (filer.Filer, string, error) {
 		fakeFiler := filer.NewFakeFiler(map[string]filer.FakeFileInfo{
-			"dir":       {name: "root", dir: true},
-			"dir/dirA":  {dir: true},
-			"dir/dirB":  {dir: true},
+			"dir":       {FakeName: "root", FakeDir: true},
+			"dir/dirA":  {FakeDir: true},
+			"dir/dirB":  {FakeDir: true},
 			"dir/fileA": {},
 		})
 		return fakeFiler, fullPath, nil

libs/completer/completer_test.go

@@ -16,7 +16,12 @@ func setupCompleter(t *testing.T, onlyDirs bool) *completer {
 	// Needed to make type context.valueCtx for mockFilerForPath
 	ctx = root.SetWorkspaceClient(ctx, mocks.NewMockWorkspaceClient(t).WorkspaceClient)
 
-	fakeFiler := filer.PrepFakeFiler()
+	fakeFiler := filer.NewFakeFiler(map[string]filer.FakeFileInfo{
+		"dir":       {FakeName: "root", FakeDir: true},
+		"dir/dirA":  {FakeDir: true},
+		"dir/dirB":  {FakeDir: true},
+		"dir/fileA": {},
+	})
 
 	return New(ctx, fakeFiler, onlyDirs)
 }

libs/filer/fake_filer.go

@@ -17,7 +17,7 @@ type FakeDirEntry struct {
 
 func (entry FakeDirEntry) Type() fs.FileMode {
 	typ := fs.ModePerm
-	if entry.dir {
+	if entry.FakeDir {
 		typ |= fs.ModeDir
 	}
 	return typ
@@ -28,30 +28,30 @@ func (entry FakeDirEntry) Info() (fs.FileInfo, error) {
 }
 
 type FakeFileInfo struct {
-	name string
-	size int64
-	dir  bool
-	mode fs.FileMode
+	FakeName string
+	FakeSize int64
+	FakeDir  bool
+	FakeMode fs.FileMode
 }
 
 func (info FakeFileInfo) Name() string {
-	return info.name
+	return info.FakeName
 }
 
 func (info FakeFileInfo) Size() int64 {
-	return info.size
+	return info.FakeSize
 }
 
 func (info FakeFileInfo) Mode() fs.FileMode {
-	return info.mode
+	return info.FakeMode
 }
 
 func (info FakeFileInfo) ModTime() time.Time {
 	return time.Now()
 }
 
 func (info FakeFileInfo) IsDir() bool {
-	return info.dir
+	return info.FakeDir
 }
 
 func (info FakeFileInfo) Sys() any {
@@ -85,7 +85,7 @@ func (f *FakeFiler) ReadDir(ctx context.Context, p string) ([]fs.DirEntry, error
 		return nil, fs.ErrNotExist
 	}
 
-	if !entry.dir {
+	if !entry.FakeDir {
 		return nil, fs.ErrInvalid
 	}
 
@@ -122,26 +122,12 @@ func NewFakeFiler(entries map[string]FakeFileInfo) *FakeFiler {
 	}
 
 	for k, v := range fakeFiler.entries {
-		if v.name != "" {
+		if v.FakeName != "" {
 			continue
 		}
-		v.name = path.Base(k)
+		v.FakeName = path.Base(k)
 		fakeFiler.entries[k] = v
 	}
 
 	return fakeFiler
 }
-
-// TODO: Remove this function
-func PrepFakeFiler() *FakeFiler {
-	return NewFakeFiler(map[string]FakeFileInfo{
-		"dir":       {name: "root", dir: true},
-		"dir/dirA":  {dir: true},
-		"dir/dirB":  {dir: true},
-		"dir/fileA": {size: 3},
-	})
-}
-
-func NewFakeFileInfo(dir bool) FakeFileInfo {
-	return FakeFileInfo{dir: dir}
-}