Add tests

microsoft · Aug 21, 2024 · a0b950d · a0b950d
1 parent 00e498e
commit a0b950d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs b/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs
@@ -654,7 +654,7 @@ private async Task<bool> EnumerateFilesFromArtifactsProvider(TContext globalCont
             {
                 globalContext.CancellationToken.ThrowIfCancellationRequested();
 
-                string filePath = artifact.Uri.OriginalString;
+                string filePath = artifact.Uri.GetFilePath();
 
                 if (globalContext.CompiledGlobalFileDenyRegex?.Match(filePath).Success == true)
                 {

diff --git a/src/Test.UnitTests.Sarif.Driver/Sdk/AnalyzeCommandBaseTests.cs b/src/Test.UnitTests.Sarif.Driver/Sdk/AnalyzeCommandBaseTests.cs
@@ -831,14 +831,25 @@ public Run AnalyzeFile(string fileName,
         }
 
         [Fact]
-        [Trait(TestTraits.WindowsOnly, "true")]
         public void AnalyzeCommand_EncodedPaths()
         {
             var logger = new MemoryStreamSarifLogger(dataToInsert: OptionallyEmittedData.Hashes);
             var command = new TestMultithreadedAnalyzeCommand();
-            var uri = new Uri("/new folder/0%1%20%.txt", UriKind.Relative);
+            string path = @"C:\new folder\repro%2DCopy2.txt";
+            var uri = new Uri(path, UriKind.Absolute);
+
+            string content = "foo foo";
+            var mockFileSystem = new Mock<IFileSystem>();
+            mockFileSystem.Setup(x => x.IsSymbolicLink(path)).Returns(false);
+            mockFileSystem.Setup(x => x.FileStreamLength(path)).Returns(content.Length);
+            mockFileSystem.Setup(x => x.FileInfoLength(path)).Returns(content.Length);
+            mockFileSystem.Setup(x => x.FileReadAllText(path)).Returns(content);
+            mockFileSystem.Setup(x => x.FileOpenRead(path)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(content)));
 
-            var target = new EnumeratedArtifact(FileSystem.Instance) { Uri = uri, Contents = "foo foo" };
+            var target = new EnumeratedArtifact(mockFileSystem.Object)
+            {
+                Uri = uri
+            };
 
             var options = new TestAnalyzeOptions
             {