Add include folder interface to the FileSystemCallbacks constructor

microsoft · Aug 5, 2019 · 7b52897 · 7b52897
1 parent f3527b6
commit 7b52897
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 32 deletions.
diff --git a/GVFS/GVFS.Mount/InProcessMount.cs b/GVFS/GVFS.Mount/InProcessMount.cs
@@ -564,6 +564,7 @@ private void MountAndStartWorkingDirectoryCallbacks(CacheServerInfo cache)
                         backgroundFileSystemTaskRunner: null,
                         fileSystemVirtualizer: virtualizer,
                         placeholderDatabase: new PlaceholderTable(this.gvfsDatabase),
+                        includedFolderCollection: new IncludedFolderTable(this.gvfsDatabase),
                         gitStatusCache: gitStatusCache);
                 }, "Failed to create src folder callback listener");
             this.maintenanceScheduler = this.CreateOrReportAndExit(() => new GitMaintenanceScheduler(this.context, this.gitObjects), "Failed to start maintenance scheduler");

diff --git a/GVFS/GVFS.PerfProfiling/ProfilingEnvironment.cs b/GVFS/GVFS.PerfProfiling/ProfilingEnvironment.cs
@@ -87,6 +87,7 @@ private FileSystemCallbacks CreateFileSystemCallbacks()
                 backgroundFileSystemTaskRunner: null,
                 fileSystemVirtualizer: null,
                 placeholderDatabase: new PlaceholderTable(this.gvfsDatabase),
+                includedFolderCollection: new IncludedFolderTable(this.gvfsDatabase),
                 gitStatusCache : null);
         }
     }

diff --git a/GVFS/GVFS.UnitTests.Windows/Windows/Virtualization/WindowsFileSystemVirtualizerTests.cs b/GVFS/GVFS.UnitTests.Windows/Windows/Virtualization/WindowsFileSystemVirtualizerTests.cs
diff --git a/GVFS/GVFS.UnitTests/Mock/FileSystem/MockFileSystemCallbacks.cs b/GVFS/GVFS.UnitTests/Mock/FileSystem/MockFileSystemCallbacks.cs
@@ -19,8 +19,9 @@ public MockFileSystemCallbacks(
             GitIndexProjection gitIndexProjection,
             BackgroundFileSystemTaskRunner backgroundFileSystemTaskRunner,
             FileSystemVirtualizer fileSystemVirtualizer,
-            IPlaceholderCollection placeholderDatabase)
-            : base(context, gitObjects, repoMetadata, blobSizes, gitIndexProjection, backgroundFileSystemTaskRunner, fileSystemVirtualizer, placeholderDatabase)
+            IPlaceholderCollection placeholderDatabase,
+            IIncludedFolderCollection includedFolderCollection)
+            : base(context, gitObjects, repoMetadata, blobSizes, gitIndexProjection, backgroundFileSystemTaskRunner, fileSystemVirtualizer, placeholderDatabase, includedFolderCollection)
         {
         }
 

diff --git a/GVFS/GVFS.UnitTests/Platform.Mac/MacFileSystemVirtualizerTests.cs b/GVFS/GVFS.UnitTests/Platform.Mac/MacFileSystemVirtualizerTests.cs
@@ -90,6 +90,7 @@ public void UpdatePlaceholderIfNeeded()
             const string UpdatePlaceholderFileName = "testUpdatePlaceholder.txt";
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
             using (MockGitIndexProjection gitIndexProjection = new MockGitIndexProjection(new[] { UpdatePlaceholderFileName }))
@@ -102,7 +103,8 @@ public void UpdatePlaceholderIfNeeded()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 gitIndexProjection.MockFileTypesAndModes.TryAdd(
                     UpdatePlaceholderFileName,
@@ -172,6 +174,7 @@ public void UpdatePlaceholderIfNeeded()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -180,6 +183,7 @@ public void WritePlaceholderForSymLink()
             const string WriteSymLinkFileName = "testWriteSymLink.txt";
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
             using (MockGitIndexProjection gitIndexProjection = new MockGitIndexProjection(new[] { WriteSymLinkFileName }))
@@ -192,7 +196,8 @@ public void WritePlaceholderForSymLink()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 gitIndexProjection.MockFileTypesAndModes.TryAdd(
                     WriteSymLinkFileName,
@@ -219,6 +224,7 @@ public void WritePlaceholderForSymLink()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -227,6 +233,7 @@ public void UpdatePlaceholderToSymLink()
             const string PlaceholderToLinkFileName = "testUpdatePlaceholderToLink.txt";
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
             using (MockGitIndexProjection gitIndexProjection = new MockGitIndexProjection(new[] { PlaceholderToLinkFileName }))
@@ -239,7 +246,8 @@ public void UpdatePlaceholderToSymLink()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 gitIndexProjection.MockFileTypesAndModes.TryAdd(
                     PlaceholderToLinkFileName,
@@ -279,6 +287,7 @@ public void UpdatePlaceholderToSymLink()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -301,6 +310,7 @@ public void OnEnumerateDirectoryReturnsSuccessWhenResultsNotInMemory()
             string testFilePath = Path.Combine(TestFolderName, TestFileName);
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
 
@@ -316,7 +326,8 @@ public void OnEnumerateDirectoryReturnsSuccessWhenResultsNotInMemory()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 gitIndexProjection.MockFileTypesAndModes.TryAdd(
                     testFilePath,
@@ -334,6 +345,7 @@ public void OnEnumerateDirectoryReturnsSuccessWhenResultsNotInMemory()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -344,6 +356,7 @@ public void OnEnumerateDirectoryReturnsSuccessWhenResultsInMemory()
             string testFilePath = Path.Combine(TestFolderName, TestFileName);
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
 
@@ -359,7 +372,8 @@ public void OnEnumerateDirectoryReturnsSuccessWhenResultsInMemory()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 gitIndexProjection.MockFileTypesAndModes.TryAdd(
                     testFilePath,
@@ -378,6 +392,7 @@ public void OnEnumerateDirectoryReturnsSuccessWhenResultsInMemory()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -392,6 +407,7 @@ public void OnEnumerateDirectorySetsFileModes()
             string testFile755Path = Path.Combine(TestFolderName, TestFile755Name);
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
 
@@ -407,7 +423,8 @@ public void OnEnumerateDirectorySetsFileModes()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 gitIndexProjection.MockFileTypesAndModes.TryAdd(
                     testFile644Path,
@@ -435,6 +452,7 @@ public void OnEnumerateDirectorySetsFileModes()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -443,6 +461,7 @@ public void OnGetFileStreamReturnsSuccessWhenFileStreamAvailable()
             const string TestFileName = "test.txt";
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
             using (MockGitIndexProjection gitIndexProjection = new MockGitIndexProjection(new[] { TestFileName }))
@@ -455,7 +474,8 @@ public void OnGetFileStreamReturnsSuccessWhenFileStreamAvailable()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 string error;
                 fileSystemCallbacks.TryStart(out error).ShouldEqual(true);
@@ -483,6 +503,7 @@ public void OnGetFileStreamReturnsSuccessWhenFileStreamAvailable()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         [TestCase]
@@ -492,6 +513,7 @@ public void OnGetFileStreamReturnsErrorWhenWriteFileContentsFails()
             const string TestFileName = "test.txt";
             Mock<IPlaceholderCollection> mockPlaceholderDb = new Mock<IPlaceholderCollection>(MockBehavior.Strict);
             mockPlaceholderDb.Setup(x => x.GetCount()).Returns(1);
+            Mock<IIncludedFolderCollection> mockIncludeDb = new Mock<IIncludedFolderCollection>(MockBehavior.Strict);
             using (MockBackgroundFileSystemTaskRunner backgroundTaskRunner = new MockBackgroundFileSystemTaskRunner())
             using (MockVirtualizationInstance mockVirtualization = new MockVirtualizationInstance())
             using (MockGitIndexProjection gitIndexProjection = new MockGitIndexProjection(new[] { TestFileName }))
@@ -504,7 +526,8 @@ public void OnGetFileStreamReturnsErrorWhenWriteFileContentsFails()
                 gitIndexProjection,
                 backgroundTaskRunner,
                 virtualizer,
-                mockPlaceholderDb.Object))
+                mockPlaceholderDb.Object,
+                mockIncludeDb.Object))
             {
                 string error;
                 fileSystemCallbacks.TryStart(out error).ShouldEqual(true);
@@ -530,6 +553,7 @@ public void OnGetFileStreamReturnsErrorWhenWriteFileContentsFails()
             }
 
             mockPlaceholderDb.VerifyAll();
+            mockIncludeDb.VerifyAll();
         }
 
         private static ushort ConvertFileTypeAndModeToIndexFormat(GitIndexProjection.FileType fileType, ushort fileMode)