Test fs refactor

Author: sheetalkamat

internal/execute/testfs_test.go

@@ -6,20 +6,12 @@ import (
 )
 
 type testFsTrackingLibs struct {
-	fs          vfs.FS
+	vfs.FS
 	defaultLibs *collections.SyncSet[string]
 }
 
-var _ vfs.FS = (*testFsTrackingLibs)(nil)
-
 func NewFSTrackingLibs(fs vfs.FS) *testFsTrackingLibs {
-	return &testFsTrackingLibs{
-		fs: fs,
-	}
-}
-
-func (f *testFsTrackingLibs) FS() vfs.FS {
-	return f.fs
+	return &testFsTrackingLibs{FS: fs}
 }
 
 func (f *testFsTrackingLibs) removeIgnoreLibPath(path string) {
@@ -28,56 +20,20 @@ func (f *testFsTrackingLibs) removeIgnoreLibPath(path string) {
 	}
 }
 
-func (f *testFsTrackingLibs) UseCaseSensitiveFileNames() bool {
-	return f.fs.UseCaseSensitiveFileNames()
-}
-
-// FileExists returns true if the file exists.
-func (f *testFsTrackingLibs) FileExists(path string) bool {
-	return f.fs.FileExists(path)
-}
-
 // ReadFile reads the file specified by path and returns the content.
 // If the file fails to be read, ok will be false.
 func (f *testFsTrackingLibs) ReadFile(path string) (contents string, ok bool) {
 	f.removeIgnoreLibPath(path)
-	return f.fs.ReadFile(path)
+	return f.FS.ReadFile(path)
 }
 
 func (f *testFsTrackingLibs) WriteFile(path string, data string, writeByteOrderMark bool) error {
 	f.removeIgnoreLibPath(path)
-	return f.fs.WriteFile(path, data, writeByteOrderMark)
+	return f.FS.WriteFile(path, data, writeByteOrderMark)
 }
 
 // Removes `path` and all its contents. Will return the first error it encounters.
 func (f *testFsTrackingLibs) Remove(path string) error {
 	f.removeIgnoreLibPath(path)
-	return f.fs.Remove(path)
-}
-
-// DirectoryExists returns true if the path is a directory.
-func (f *testFsTrackingLibs) DirectoryExists(path string) bool {
-	return f.fs.DirectoryExists(path)
-}
-
-// GetAccessibleEntries returns the files/directories in the specified directory.
-// If any entry is a symlink, it will be followed.
-func (f *testFsTrackingLibs) GetAccessibleEntries(path string) vfs.Entries {
-	return f.fs.GetAccessibleEntries(path)
-}
-
-func (f *testFsTrackingLibs) Stat(path string) vfs.FileInfo {
-	return f.fs.Stat(path)
-}
-
-// WalkDir walks the file tree rooted at root, calling walkFn for each file or directory in the tree.
-// It is has the same behavior as [fs.WalkDir], but with paths as [string].
-func (f *testFsTrackingLibs) WalkDir(root string, walkFn vfs.WalkDirFunc) error {
-	return f.fs.WalkDir(root, walkFn)
-}
-
-// Realpath returns the "real path" of the specified path,
-// following symlinks and correcting filename casing.
-func (f *testFsTrackingLibs) Realpath(path string) string {
-	return f.fs.Realpath(path)
+	return f.FS.Remove(path)
 }

internal/execute/testsys_test.go

@@ -115,7 +115,7 @@ func (s *testSys) FS() vfs.FS {
 }
 
 func (s *testSys) TestFS() *incrementaltestutil.FsHandlingBuildInfo {
-	return s.fs.fs.(*incrementaltestutil.FsHandlingBuildInfo)
+	return s.fs.FS.(*incrementaltestutil.FsHandlingBuildInfo)
 }
 
 func (s *testSys) ensureLibPathExists(path string) {
@@ -239,7 +239,7 @@ func (s *testSys) baselineFSwithDiff(baseline io.Writer) {
 			return nil
 		}
 
-		newContents, ok := s.TestFS().FS().ReadFile(path)
+		newContents, ok := s.TestFS().InnerReadFile(path)
 		if !ok {
 			return nil
 		}
@@ -258,7 +258,7 @@ func (s *testSys) baselineFSwithDiff(baseline io.Writer) {
 	}
 	if s.serializedDiff != nil {
 		for path := range s.serializedDiff.snap {
-			_, ok := s.TestFS().FS().ReadFile(path)
+			_, ok := s.TestFS().InnerReadFile(path)
 			if !ok {
 				// report deleted
 				s.reportFSEntryDiff(baseline, nil, path)

internal/testutil/incrementaltestutil/fs.go

@@ -13,34 +13,21 @@ import (
 var fakeTsVersion = "FakeTSVersion"
 
 type FsHandlingBuildInfo struct {
-	fs vfs.FS
+	vfs.FS
 }
 
-var _ vfs.FS = (*FsHandlingBuildInfo)(nil)
-
 func NewFsHandlingBuildInfo(fs vfs.FS) *FsHandlingBuildInfo {
-	return &FsHandlingBuildInfo{
-		fs: fs,
-	}
+	return &FsHandlingBuildInfo{FS: fs}
 }
 
-func (f *FsHandlingBuildInfo) FS() vfs.FS {
-	return f.fs
-}
-
-func (f *FsHandlingBuildInfo) UseCaseSensitiveFileNames() bool {
-	return f.fs.UseCaseSensitiveFileNames()
-}
-
-// FileExists returns true if the file exists.
-func (f *FsHandlingBuildInfo) FileExists(path string) bool {
-	return f.fs.FileExists(path)
+func (f *FsHandlingBuildInfo) InnerReadFile(path string) (contents string, ok bool) {
+	return f.FS.ReadFile(path)
 }
 
 // ReadFile reads the file specified by path and returns the content.
 // If the file fails to be read, ok will be false.
 func (f *FsHandlingBuildInfo) ReadFile(path string) (contents string, ok bool) {
-	contents, ok = f.fs.ReadFile(path)
+	contents, ok = f.InnerReadFile(path)
 	if ok && tspath.FileExtensionIs(path, tspath.ExtensionTsBuildInfo) {
 		// read buildinfo and modify version
 		var buildInfo incremental.BuildInfo
@@ -71,42 +58,10 @@ func (f *FsHandlingBuildInfo) WriteFile(path string, data string, writeByteOrder
 				data = string(newData)
 			}
 			// Write readable build info version
-			if err := f.fs.WriteFile(path+".readable.baseline.txt", toReadableBuildInfo(&buildInfo, data), false); err != nil {
+			if err := f.FS.WriteFile(path+".readable.baseline.txt", toReadableBuildInfo(&buildInfo, data), false); err != nil {
 				return fmt.Errorf("testFs.WriteFile: failed to write readable build info: %w", err)
 			}
 		}
 	}
-	return f.fs.WriteFile(path, data, writeByteOrderMark)
-}
-
-// Removes `path` and all its contents. Will return the first error it encounters.
-func (f *FsHandlingBuildInfo) Remove(path string) error {
-	return f.fs.Remove(path)
-}
-
-// DirectoryExists returns true if the path is a directory.
-func (f *FsHandlingBuildInfo) DirectoryExists(path string) bool {
-	return f.fs.DirectoryExists(path)
-}
-
-// GetAccessibleEntries returns the files/directories in the specified directory.
-// If any entry is a symlink, it will be followed.
-func (f *FsHandlingBuildInfo) GetAccessibleEntries(path string) vfs.Entries {
-	return f.fs.GetAccessibleEntries(path)
-}
-
-func (f *FsHandlingBuildInfo) Stat(path string) vfs.FileInfo {
-	return f.fs.Stat(path)
-}
-
-// WalkDir walks the file tree rooted at root, calling walkFn for each file or directory in the tree.
-// It is has the same behavior as [fs.WalkDir], but with paths as [string].
-func (f *FsHandlingBuildInfo) WalkDir(root string, walkFn vfs.WalkDirFunc) error {
-	return f.fs.WalkDir(root, walkFn)
-}
-
-// Realpath returns the "real path" of the specified path,
-// following symlinks and correcting filename casing.
-func (f *FsHandlingBuildInfo) Realpath(path string) string {
-	return f.fs.Realpath(path)
+	return f.FS.WriteFile(path, data, writeByteOrderMark)
 }