Fix #1575: SarifSdkTest.xml conversion test does not run. (#1646)

Update the project file to include SarifSdkTest.xml in the FxCop conversion unit tests. The corresponding .xml.sarif file was already valid, except for a message string that we recently changed. I don't know why, at the time #1575 was filed, the test would fail if you enabled it.
microsoft · Aug 15, 2019 · 464f95b · 464f95b
1 parent 8bc1e45
commit 464f95b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 58 deletions.
diff --git a/src/ReleaseHistory.md b/src/ReleaseHistory.md
@@ -445,5 +445,6 @@
 * FEATURE: Add validation rule to ensure that all array-index-valued properties are consistent with their respective arrays.
 
 ** **v2.1.15** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.1.15) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.1.15) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.1.15) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.1.15)
+* BUGFIX: Restore missing FxCop converter unit test. https://github.com/microsoft/sarif-sdk/issues/1575
 * BUGFIX: FortifyFpr converter produced invalid SARIF. https://github.com/microsoft/sarif-sdk/issues/1593
 * BUGFIX: FxCop converter produced empty `result.message` objects. https://github.com/microsoft/sarif-sdk/issues/1594
diff --git a/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj b/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj
@@ -2816,6 +2816,12 @@
     <None Include="v2\ConverterTestData\FxCop\FxCopNoTargets.xml.sarif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.fxcop.sarif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.xml.sarif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="v2\SpecExamples\Comprehensive.sarif">
@@ -2906,6 +2912,12 @@
     <None Include="v2\ConverterTestData\FxCop\FxCopNoTargets.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.fxcop">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="v2\ConverterTestData\ClangAnalyzer\ArrayDataTypes.xml">
@@ -3552,21 +3564,6 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>bannedAPIs.cs</LastGenOutput>
     </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdk.fxcop.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdk.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdk.xml.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdkTest.fxcop.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdkTest.xml.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="v2\ConverterTestData\PREfast\AB_IrrelevantBranch.cpp.xml">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>AB_IrrelevantBranch.cpp.cs</LastGenOutput>

diff --git a/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif b/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif