Get v2 -> v1 transform working with files array (#1211)

Test failure count is down to 32; will be 28 when you merge your fix. There is not -- and never was -- a test case for fileLocations that use uriBaseId (never was one). I know for a fact that there is no code to support that case. You’ll see a comment to that effect in the code. I will take care of that next. Then I will move on to v1 -> v2 transform. As part of this change, the `SarifCurrentToVersionOneVisitorTests` are now based on the `RunTest` helper method from the base class `FileDiffingTests`.
microsoft · Jan 14, 2019 · c8b1502 · c8b1502
1 parent 07992e3
commit c8b1502
Show file tree

Hide file tree

Showing 28 changed files with 308 additions and 278 deletions.
diff --git a/src/Sarif.TestUtilities/FileDiffingTests.cs b/src/Sarif.TestUtilities/FileDiffingTests.cs
@@ -7,6 +7,8 @@
 using System.Reflection;
 using System.Text;
 using FluentAssertions;
+using Microsoft.CodeAnalysis.Sarif.Readers;
+using Microsoft.CodeAnalysis.Sarif.VersionOne;
 using Microsoft.CodeAnalysis.Sarif.Writers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -30,10 +32,12 @@ public static string GetProductTestDataDirectory(string subdirectory = "")
         }
 
         private readonly ITestOutputHelper _outputHelper;
+        private readonly bool _testProducesSarifCurrentVersion;
 
-        public FileDiffingTests(ITestOutputHelper outputHelper)
+        public FileDiffingTests(ITestOutputHelper outputHelper, bool testProducesSarifCurrentVersion = true)
         {
             _outputHelper = outputHelper;
+            _testProducesSarifCurrentVersion = testProducesSarifCurrentVersion;
 
             if (Directory.Exists(OutputFolderPath))
             {
@@ -70,20 +74,27 @@ protected virtual void RunTest(string resourceName)
             var sb = new StringBuilder();
 
             string expectedSarifText = GetResourceText("ExpectedOutputs." + resourceName);
-            PrereleaseCompatibilityTransformer.UpdateToCurrentVersion(expectedSarifText, forceUpdate: false, Formatting.Indented, out expectedSarifText);
 
-            if (!AreEquivalentSarifLogs<SarifLog>(actualSarifText, expectedSarifText))
+            bool passed;
+            if (_testProducesSarifCurrentVersion)
+            {
+                PrereleaseCompatibilityTransformer.UpdateToCurrentVersion(expectedSarifText, forceUpdate: false, Formatting.Indented, out expectedSarifText);
+                passed = AreEquivalentSarifLogs<SarifLog>(actualSarifText, expectedSarifText);
+            }
+            else
+            {
+                passed = AreEquivalentSarifLogs<SarifLogVersionOne>(actualSarifText, expectedSarifText, SarifContractResolverVersionOne.Instance);
+            }
+
+            if (!passed)
             {
                 string errorMessage = string.Format(@"there should be no unexpected diffs detected comparing actual results to '{0}'.", resourceName);
                 sb.AppendLine(errorMessage);
 
                 if (!Utilities.RunningInAppVeyor)
                 {
-                    string expectedFilePath = null;
-                    string actualFilePath = null;
-
-                    expectedFilePath = GetOutputFilePath("ExpectedOutputs", resourceName);
-                    actualFilePath = GetOutputFilePath("ActualOutputs", resourceName);
+                    string expectedFilePath = GetOutputFilePath("ExpectedOutputs", resourceName);
+                    string actualFilePath = GetOutputFilePath("ActualOutputs", resourceName);
 
                     string expectedRootDirectory = Path.GetDirectoryName(expectedFilePath);
                     string actualRootDirectory = Path.GetDirectoryName(actualFilePath);

diff --git a/src/Sarif.UnitTests/Sarif.UnitTests.csproj b/src/Sarif.UnitTests/Sarif.UnitTests.csproj
@@ -33,30 +33,30 @@
   <ItemGroup>
     <None Remove="TestData\PrereleaseCompatibilityTransformer\ExpectedOutputs\NestedFiles.sarif" />
     <None Remove="TestData\PrereleaseCompatibilityTransformer\Inputs\NestedFiles.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\Minimum.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\MinimumWithTwoRuns.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\NotificationExceptionWithStack.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithBasicInvocation.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithFiles.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithInvocationAndNotifications.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithLogicalLocations.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithRules.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\Regions.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\RestoreFromPropertyBag.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\ResultLocations.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v1\TwoResultsWithFixes.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\Minimum.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\MinimumWithTwoRuns.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\NotificationExceptionWithStack.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithBasicInvocation.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithFiles.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithInvocationAndNotifications.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithLogicalLocations.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithRules.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\Regions.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\RestoreFromPropertyBag.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\ResultLocations.sarif" />
-    <None Remove="TestData\SarifCurrentToVersionOneVisitor\v2\TwoResultsWithFixes.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\Minimum.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\MinimumWithTwoRuns.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\NotificationExceptionWithStack.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithBasicInvocation.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithFiles.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithInvocationAndNotifications.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithLogicalLocations.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithRules.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\Regions.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\RestoreFromPropertyBag.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\ResultLocations.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\TwoResultsWithFixes.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\Minimum.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\MinimumWithTwoRuns.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\NotificationExceptionWithStack.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithBasicInvocation.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithFiles.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithInvocationAndNotifications.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithLogicalLocations.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithRules.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\Regions.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\RestoreFromPropertyBag.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\ResultLocations.sarif" />
+    <None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\TwoResultsWithFixes.sarif" />
     <None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\BasicResult.sarif" />
     <None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\CodeFlows.sarif" />
     <None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\Minimum.sarif" />
@@ -90,30 +90,30 @@
   <ItemGroup>
     <EmbeddedResource Include="TestData\PrereleaseCompatibilityTransformer\ExpectedOutputs\NestedFiles.sarif" />
     <EmbeddedResource Include="TestData\PrereleaseCompatibilityTransformer\Inputs\NestedFiles.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\Minimum.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\MinimumWithTwoRuns.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\NotificationExceptionWithStack.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithBasicInvocation.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithFiles.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithInvocationAndNotifications.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithLogicalLocations.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\OneRunWithRules.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\Regions.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\RestoreFromPropertyBag.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\ResultLocations.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v1\TwoResultsWithFixes.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\Minimum.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\MinimumWithTwoRuns.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\NotificationExceptionWithStack.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithBasicInvocation.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithFiles.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithInvocationAndNotifications.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithLogicalLocations.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\OneRunWithRules.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\Regions.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\RestoreFromPropertyBag.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\ResultLocations.sarif" />
-    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\v2\TwoResultsWithFixes.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\Minimum.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\MinimumWithTwoRuns.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\NotificationExceptionWithStack.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithBasicInvocation.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithFiles.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithInvocationAndNotifications.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithLogicalLocations.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\OneRunWithRules.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\Regions.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\RestoreFromPropertyBag.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\ResultLocations.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\ExpectedOutputs\TwoResultsWithFixes.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\Minimum.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\MinimumWithTwoRuns.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\NotificationExceptionWithStack.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithBasicInvocation.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithFiles.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithInvocationAndNotifications.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithLogicalLocations.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\OneRunWithRules.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\Regions.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\RestoreFromPropertyBag.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\ResultLocations.sarif" />
+    <EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\TwoResultsWithFixes.sarif" />
     <EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\BasicResult.sarif" />
     <EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\CodeFlows.sarif" />
     <EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\Minimum.sarif" />

diff --git a/...rrentToVersionOneVisitor/v1/Minimum.sarif → ...nOneVisitor/ExpectedOutputs/Minimum.sarif b/...rrentToVersionOneVisitor/v1/Minimum.sarif → ...nOneVisitor/ExpectedOutputs/Minimum.sarif
diff --git a/...ionOneVisitor/v1/MinimumWithTwoRuns.sarif → .../ExpectedOutputs/MinimumWithTwoRuns.sarif b/...ionOneVisitor/v1/MinimumWithTwoRuns.sarif → .../ExpectedOutputs/MinimumWithTwoRuns.sarif
diff --git a/...r/v1/NotificationExceptionWithStack.sarif → ...puts/NotificationExceptionWithStack.sarif b/...r/v1/NotificationExceptionWithStack.sarif → ...puts/NotificationExceptionWithStack.sarif
diff --git a/...isitor/v1/OneRunWithBasicInvocation.sarif → ...edOutputs/OneRunWithBasicInvocation.sarif b/...isitor/v1/OneRunWithBasicInvocation.sarif → ...edOutputs/OneRunWithBasicInvocation.sarif
@@ -27,9 +27,7 @@
         }
       },
       "files": {
-        "collections.rsp": {
-          "uri": "collections.rsp"
-        }
+        "collections.rsp": {}
       },
       "results": []
     }

diff --git a/...ersionOneVisitor/v1/OneRunWithFiles.sarif → ...tor/ExpectedOutputs/OneRunWithFiles.sarif b/...ersionOneVisitor/v1/OneRunWithFiles.sarif → ...tor/ExpectedOutputs/OneRunWithFiles.sarif
@@ -27,11 +27,25 @@
           }
         },
         "file:///home/buildAgent/bin/app.zip#/docs/intro.docx": {
-          "uri": "file:///docs/intro.docx",
+          "uri": "/docs/intro.docx",
           "parentKey": "file:///home/buildAgent/bin/app.zip",
           "offset": 17522,
           "length": 4050,
           "mimeType": "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+        },
+        "file:///home/buildAgent/bin/app.zip#/data.zip": {
+          "uri": "/data.zip",
+          "parentKey": "file:///home/buildAgent/bin/app.zip",
+          "offset": 901299,
+          "length": 170633,
+          "mimeType": "application/zip"
+        },
+        "file:///home/buildAgent/bin/app.zip#/data.zip/state-data/wa.dat": {
+          "uri": "/state-data/wa.dat",
+          "parentKey": "file:///home/buildAgent/bin/app.zip#/data.zip",
+          "offset": 475,
+          "length": 8214,
+          "mimeType": "application/octet-stream"
         }
       },
       "results": []

diff --git a/...neRunWithInvocationAndNotifications.sarif → ...neRunWithInvocationAndNotifications.sarif b/...neRunWithInvocationAndNotifications.sarif → ...neRunWithInvocationAndNotifications.sarif
diff --git a/...sitor/v1/OneRunWithLogicalLocations.sarif → ...dOutputs/OneRunWithLogicalLocations.sarif b/...sitor/v1/OneRunWithLogicalLocations.sarif → ...dOutputs/OneRunWithLogicalLocations.sarif
diff --git a/...ersionOneVisitor/v1/OneRunWithRules.sarif → ...tor/ExpectedOutputs/OneRunWithRules.sarif b/...ersionOneVisitor/v1/OneRunWithRules.sarif → ...tor/ExpectedOutputs/OneRunWithRules.sarif
diff --git a/...rrentToVersionOneVisitor/v1/Regions.sarif → ...nOneVisitor/ExpectedOutputs/Regions.sarif b/...rrentToVersionOneVisitor/v1/Regions.sarif → ...nOneVisitor/ExpectedOutputs/Regions.sarif
@@ -11,16 +11,13 @@
       "invocation": {},
       "files": {
         "file:///src/base/driver.cs": {
-          "uri": "file:///src/base/driver.cs",
           "contents": "YQBiAGMAZAANAAoAZQBmAGcADQAKAGgAaQBqAGsADQAKAGwAbQBuAA=="
         },
         "file:///src/ui/client.cs": {
-          "uri": "file:///src/ui/client.cs",
           "mimeType": "text/x-csharp",
           "contents": "VGhlIHF1aWNrIGJyb3duIGZveA0KanVtcHMgb3ZlciB0aGUgbGFhenkgZG9n"
         },
         "file:///src/ui/unicodeText.cs": {
-          "uri": "file:///src/ui/unicodeText.cs",
           "mimeType": "text/x-csharp",
           "contents": "VGhlIHF1aWNrIGJyb3duIGZveA0KanVtcHMgb3ZlciB0aGUgbGFhenkgZG9n"
         }

diff --git a/...neVisitor/v1/RestoreFromPropertyBag.sarif → ...ectedOutputs/RestoreFromPropertyBag.sarif b/...neVisitor/v1/RestoreFromPropertyBag.sarif → ...ectedOutputs/RestoreFromPropertyBag.sarif
diff --git a/...ersionOneVisitor/v1/ResultLocations.sarif → ...tor/ExpectedOutputs/ResultLocations.sarif b/...ersionOneVisitor/v1/ResultLocations.sarif → ...tor/ExpectedOutputs/ResultLocations.sarif
diff --git a/...onOneVisitor/v1/TwoResultsWithFixes.sarif → ...ExpectedOutputs/TwoResultsWithFixes.sarif b/...onOneVisitor/v1/TwoResultsWithFixes.sarif → ...ExpectedOutputs/TwoResultsWithFixes.sarif
diff --git a/...rrentToVersionOneVisitor/v2/Minimum.sarif → ...tToVersionOneVisitor/Inputs/Minimum.sarif b/...rrentToVersionOneVisitor/v2/Minimum.sarif → ...tToVersionOneVisitor/Inputs/Minimum.sarif
diff --git a/...ionOneVisitor/v2/MinimumWithTwoRuns.sarif → ...neVisitor/Inputs/MinimumWithTwoRuns.sarif b/...ionOneVisitor/v2/MinimumWithTwoRuns.sarif → ...neVisitor/Inputs/MinimumWithTwoRuns.sarif
diff --git a/...r/v2/NotificationExceptionWithStack.sarif → ...puts/NotificationExceptionWithStack.sarif b/...r/v2/NotificationExceptionWithStack.sarif → ...puts/NotificationExceptionWithStack.sarif
diff --git a/...isitor/v2/OneRunWithBasicInvocation.sarif → ...or/Inputs/OneRunWithBasicInvocation.sarif b/...isitor/v2/OneRunWithBasicInvocation.sarif → ...or/Inputs/OneRunWithBasicInvocation.sarif
diff --git a/...ersionOneVisitor/v2/OneRunWithFiles.sarif → ...onOneVisitor/Inputs/OneRunWithFiles.sarif b/...ersionOneVisitor/v2/OneRunWithFiles.sarif → ...onOneVisitor/Inputs/OneRunWithFiles.sarif
@@ -37,6 +37,20 @@
           "length": 4050,
           "mimeType": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
           "contents": {}
+        },
+        "file:///home/buildAgent/bin/app.zip#/data.zip": {
+          "uri": "/data.zip",
+          "parentKey": "file:///home/buildAgent/bin/app.zip",
+          "offset": 901299,
+          "length": 170633,
+          "mimeType": "application/zip"
+        },
+        "file:///home/buildAgent/bin/app.zip#/data.zip/state-data/wa.dat": {
+          "uri": "/state-data/wa.dat",
+          "parentKey": "file:///home/buildAgent/bin/app.zip#/data.zip",
+          "offset": 475,
+          "length": 8214,
+          "mimeType": "application/octet-stream"
         }
       },
       "results": []

diff --git a/...neRunWithInvocationAndNotifications.sarif → ...neRunWithInvocationAndNotifications.sarif b/...neRunWithInvocationAndNotifications.sarif → ...neRunWithInvocationAndNotifications.sarif
diff --git a/...sitor/v2/OneRunWithLogicalLocations.sarif → ...r/Inputs/OneRunWithLogicalLocations.sarif b/...sitor/v2/OneRunWithLogicalLocations.sarif → ...r/Inputs/OneRunWithLogicalLocations.sarif
diff --git a/...ersionOneVisitor/v2/OneRunWithRules.sarif → ...onOneVisitor/Inputs/OneRunWithRules.sarif b/...ersionOneVisitor/v2/OneRunWithRules.sarif → ...onOneVisitor/Inputs/OneRunWithRules.sarif
diff --git a/...rrentToVersionOneVisitor/v2/Regions.sarif → ...tToVersionOneVisitor/Inputs/Regions.sarif b/...rrentToVersionOneVisitor/v2/Regions.sarif → ...tToVersionOneVisitor/Inputs/Regions.sarif
diff --git a/...neVisitor/v2/RestoreFromPropertyBag.sarif → ...sitor/Inputs/RestoreFromPropertyBag.sarif b/...neVisitor/v2/RestoreFromPropertyBag.sarif → ...sitor/Inputs/RestoreFromPropertyBag.sarif
diff --git a/...ersionOneVisitor/v2/ResultLocations.sarif → ...onOneVisitor/Inputs/ResultLocations.sarif b/...ersionOneVisitor/v2/ResultLocations.sarif → ...onOneVisitor/Inputs/ResultLocations.sarif
diff --git a/...onOneVisitor/v2/TwoResultsWithFixes.sarif → ...eVisitor/Inputs/TwoResultsWithFixes.sarif b/...onOneVisitor/v2/TwoResultsWithFixes.sarif → ...eVisitor/Inputs/TwoResultsWithFixes.sarif