Migrate tests from MSTest to xUnit and clean up test infrastructure

Directory.Build.props

@@ -7,10 +7,5 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- MSTest config -->
-  <PropertyGroup>
-    <EnableMSTestRunner>true</EnableMSTestRunner>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
-    <MSTestAnalysisMode>Recommended</MSTestAnalysisMode>
-  </PropertyGroup>
+
 </Project>

Pipelines/recursive-extractor-pr.yml

@@ -42,12 +42,16 @@ extends:
           poolName: MSSecurity-1ES-Build-Agents-Pool
           poolImage: MSSecurity-1ES-Windows-2022
           poolOs: windows
-          dotnetTestArgs: '-- --coverage --report-trx'
+          dotnetTestArgs: '--settings coverlet.runsettings --collect:"XPlat Code Coverage"'
           includeNuGetOrg: false
           nugetFeedsToUse: 'config'
           nugetConfigPath: 'nuget.config'
           onInit:
             - task: NuGetAuthenticate@1
+          postTest:
+            - task: PublishCodeCoverageResults@2
+              inputs:
+                summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
 
       - template: dotnet-test-job.yml@templates
         parameters:
@@ -57,12 +61,16 @@ extends:
           poolName: MSSecurity-1ES-Build-Agents-Pool
           poolImage: MSSecurity-1ES-Windows-2022
           poolOs: windows
-          dotnetTestArgs: '-- --coverage --report-trx'
+          dotnetTestArgs: '--settings coverlet.runsettings --collect:"XPlat Code Coverage"'
           includeNuGetOrg: false
           nugetFeedsToUse: 'config'
           nugetConfigPath: 'nuget.config'
           onInit:
             - task: NuGetAuthenticate@1
+          postTest:
+            - task: PublishCodeCoverageResults@2
+              inputs:
+                summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
 
     - stage: Build
       dependsOn:

Pipelines/recursive-extractor-release.yml

@@ -43,12 +43,16 @@ extends:
           poolName: MSSecurity-1ES-Build-Agents-Pool
           poolImage: MSSecurity-1ES-Windows-2022
           poolOs: windows
-          dotnetTestArgs: '-- --coverage --report-trx'
+          dotnetTestArgs: '--settings coverlet.runsettings --collect:"XPlat Code Coverage"'
           includeNuGetOrg: false
           nugetFeedsToUse: 'config'
           nugetConfigPath: 'nuget.config'
           onInit:
             - task: NuGetAuthenticate@1
+          postTest:
+            - task: PublishCodeCoverageResults@2
+              inputs:
+                summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
       - template: dotnet-test-job.yml@templates
         parameters:
           jobName: 'cli_dotnet_test_windows'
@@ -57,12 +61,16 @@ extends:
           poolName: MSSecurity-1ES-Build-Agents-Pool
           poolImage: MSSecurity-1ES-Windows-2022
           poolOs: windows
-          dotnetTestArgs: '-- --coverage --report-trx'
+          dotnetTestArgs: '--settings coverlet.runsettings --collect:"XPlat Code Coverage"'
           includeNuGetOrg: false
           nugetFeedsToUse: 'config'
           nugetConfigPath: 'nuget.config'
           onInit:
             - task: NuGetAuthenticate@1
+          postTest:
+            - task: PublishCodeCoverageResults@2
+              inputs:
+                summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
 
     - stage: Build
       dependsOn:

RecursiveExtractor.Cli.Tests/CliTests/CliTests.cs

@@ -3,41 +3,40 @@
 using Microsoft.CST.RecursiveExtractor;
 using Microsoft.CST.RecursiveExtractor.Cli;
 using Microsoft.CST.RecursiveExtractor.Tests;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RecursiveExtractor.Tests.ExtractorTests;
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Xunit;
 
 namespace RecursiveExtractor.Tests.CliTests
 {
-    [TestClass]
-    public class CliTests : BaseExtractorTestClass
+    public class CliTests : IClassFixture<BaseExtractorTestClass>
     {
-        [DataTestMethod]
-        [DataRow("TestData.zip", 5)]
-        [DataRow("TestData.7z")]
-        [DataRow("TestData.tar", 6)]
-        [DataRow("TestData.rar")]
-        [DataRow("TestData.rar4")]
-        [DataRow("TestData.tar.bz2", 6)]
-        [DataRow("TestData.tar.gz", 6)]
-        [DataRow("TestData.tar.xz")]
-        [DataRow("sysvbanner_1.0-17fakesync1_amd64.deb", 8)]
-        [DataRow("TestData.a")]
-        [DataRow("TestData.bsd.ar")]
-        [DataRow("TestData.iso")]
-        [DataRow("TestData.vhdx")]
-        [DataRow("TestData.wim")]
-        [DataRow("EmptyFile.txt", 1)]
-        [DataRow("TestDataArchivesNested.Zip", 54)]
+        [Theory]
+        [InlineData("TestData.zip", 5)]
+        [InlineData("TestData.7z")]
+        [InlineData("TestData.tar", 6)]
+        [InlineData("TestData.rar")]
+        [InlineData("TestData.rar4")]
+        [InlineData("TestData.tar.bz2", 6)]
+        [InlineData("TestData.tar.gz", 6)]
+        [InlineData("TestData.tar.xz")]
+        [InlineData("sysvbanner_1.0-17fakesync1_amd64.deb", 8)]
+        [InlineData("TestData.a")]
+        [InlineData("TestData.bsd.ar")]
+        [InlineData("TestData.iso")]
+        [InlineData("TestData.vhdx")]
+        [InlineData("TestData.wim")]
+        [InlineData("EmptyFile.txt", 1)]
+        [InlineData("TestDataArchivesNested.Zip", 54)]
         public void ExtractArchiveParallel(string fileName, int expectedNumFiles = 3)
         {
-            ExtractArchive(fileName, expectedNumFiles, false);
+            CliTests.ExtractArchive(fileName, expectedNumFiles, false);
         }
 
-        internal void ExtractArchive(string fileName, int expectedNumFiles, bool singleThread)
+        internal static void ExtractArchive(string fileName, int expectedNumFiles, bool singleThread)
         {
             var directory = TestPathHelpers.GetFreshTestDirectory();
             var path = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "TestDataArchives", fileName);
@@ -46,35 +45,35 @@ internal void ExtractArchive(string fileName, int expectedNumFiles, bool singleT
             Thread.Sleep(100);
             if (Directory.Exists(directory))
             {
-                files = Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories).ToArray();
+                files = [.. Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories)];
             }
-            Assert.AreEqual(expectedNumFiles, files.Length);
+            Assert.Equal(expectedNumFiles, files.Length);
         }
 
-        [DataTestMethod]
-        [DataRow("TestData.zip", 5)]
-        [DataRow("TestData.7z")]
-        [DataRow("TestData.tar", 6)]
-        [DataRow("TestData.rar")]
-        [DataRow("TestData.rar4")]
-        [DataRow("TestData.tar.bz2", 6)]
-        [DataRow("TestData.tar.gz", 6)]
-        [DataRow("TestData.tar.xz")]
-        [DataRow("sysvbanner_1.0-17fakesync1_amd64.deb", 8)]
-        [DataRow("TestData.a")]
-        [DataRow("TestData.bsd.ar")]
-        [DataRow("TestData.iso")]
-        [DataRow("TestData.vhdx")]
-        [DataRow("TestData.wim")]
-        [DataRow("EmptyFile.txt", 1)]
-        [DataRow("TestDataArchivesNested.Zip", 54)]
+        [Theory]
+        [InlineData("TestData.zip", 5)]
+        [InlineData("TestData.7z")]
+        [InlineData("TestData.tar", 6)]
+        [InlineData("TestData.rar")]
+        [InlineData("TestData.rar4")]
+        [InlineData("TestData.tar.bz2", 6)]
+        [InlineData("TestData.tar.gz", 6)]
+        [InlineData("TestData.tar.xz")]
+        [InlineData("sysvbanner_1.0-17fakesync1_amd64.deb", 8)]
+        [InlineData("TestData.a")]
+        [InlineData("TestData.bsd.ar")]
+        [InlineData("TestData.iso")]
+        [InlineData("TestData.vhdx")]
+        [InlineData("TestData.wim")]
+        [InlineData("EmptyFile.txt", 1)]
+        [InlineData("TestDataArchivesNested.Zip", 54)]
         public void ExtractArchiveSingleThread(string fileName, int expectedNumFiles = 3)
         {
-            ExtractArchive(fileName, expectedNumFiles, true);
+            CliTests.ExtractArchive(fileName, expectedNumFiles, true);
         }
 
-        [DataTestMethod]
-        [DataRow("TestDataForFilters.7z")]
+        [Theory]
+        [InlineData("TestDataForFilters.7z")]
         public void ExtractArchiveWithAllowFilters(string fileName, int expectedNumFiles = 1)
         {
             var directory = TestPathHelpers.GetFreshTestDirectory();
@@ -86,21 +85,21 @@ public void ExtractArchiveWithAllowFilters(string fileName, int expectedNumFiles
                 Input = newpath,
                 Output = directory,
                 Verbose = true,
-                AllowFilters = new string[]
-                {
+                AllowFilters =
+                [
                     "*.cs"
-                }
+                ]
             });
             var files = Array.Empty<string>();
             if (Directory.Exists(directory))
             {
-                files = Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories).ToArray();
+                files = [.. Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories)];
             }
-            Assert.AreEqual(expectedNumFiles, files.Length);
+            Assert.Equal(expectedNumFiles, files.Length);
         }
 
-        [DataTestMethod]
-        [DataRow("TestDataForFilters.7z")]
+        [Theory]
+        [InlineData("TestDataForFilters.7z")]
         public void ExtractArchiveWithDenyFilters(string fileName, int expectedNumFiles = 2)
         {
             var directory = TestPathHelpers.GetFreshTestDirectory();
@@ -112,33 +111,31 @@ public void ExtractArchiveWithDenyFilters(string fileName, int expectedNumFiles
                 Input = newpath,
                 Output = directory,
                 Verbose = true,
-                DenyFilters = new string[]
-                {
+                DenyFilters =
+                [
                     "*.cs"
-                }
+                ]
             });
             var files = Array.Empty<string>();
             if (Directory.Exists(directory))
             {
-                files = Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories).ToArray();
+                files = [.. Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories)];
             }
-            Assert.AreEqual(expectedNumFiles, files.Length);
+            Assert.Equal(expectedNumFiles, files.Length);
         }
 
-        [DataTestMethod]
-        [DataRow("TestDataEncrypted.7z")]
-        [DataRow("TestDataEncryptedAes.zip")]
-        [DataRow("TestDataEncrypted.rar4")]
+        [Theory]
+        [InlineData("TestDataEncrypted.7z")]
+        [InlineData("TestDataEncryptedAes.zip")]
+        [InlineData("TestDataEncrypted.rar4")]
         public void ExtractEncryptedArchive(string fileName, int expectedNumFiles = 3)
         {
             var directory = TestPathHelpers.GetFreshTestDirectory();
             var path = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "TestDataArchives", fileName);
             var passwords = EncryptedArchiveTests.TestArchivePasswords.Values.SelectMany(x => x);
             RecursiveExtractorClient.ExtractCommand(new ExtractCommandOptions() { Input = path, Output = directory, Verbose = true, Passwords = passwords });
-            string[] files = Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories).ToArray();
-            Assert.AreEqual(expectedNumFiles, files.Length);
-        }
-
-        protected static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
+            string[] files = [.. Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories)];
+            Assert.Equal(expectedNumFiles, files.Length);
+        }        
     }
 }

RecursiveExtractor.Cli.Tests/RecursiveExtractor.Cli.Tests.csproj

@@ -6,13 +6,13 @@
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
-        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
-        <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
-        <PackageReference Include="MSTest" Version="3.10.4" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     </ItemGroup>
 
     <ItemGroup>

RecursiveExtractor.Cli.Tests/Usings.cs

@@ -1,2 +1,2 @@
-global using Microsoft.VisualStudio.TestTools.UnitTesting;
+global using Xunit;
 

RecursiveExtractor.Tests/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = false)]

RecursiveExtractor.Tests/ExtractorTests/BaseExtractorTestClass.cs

@@ -1,21 +1,19 @@
 using Microsoft.CST.RecursiveExtractor.Tests;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NLog;
 using NLog.Config;
 using NLog.Targets;
+using System;
 
 namespace RecursiveExtractor.Tests.ExtractorTests;
 
-public class BaseExtractorTestClass
+/// <summary>
+/// XUnit test fixture class for extractor tests. Sets up logging and test directories. Tests should use this class as a fixture via IClassFixture&lt;BaseExtractorTestClass&gt; to get the benefits of the setup and teardown.
+/// </summary>
+public class BaseExtractorTestClass : IDisposable
 {
-    [ClassCleanup]
-    public static void ClassCleanup()
-    {
-        TestPathHelpers.DeleteTestDirectory();
-    }
+    protected static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
 
-    [ClassInitialize]
-    public static void ClassInitialize(TestContext context)
+    static BaseExtractorTestClass()
     {
         var config = new LoggingConfiguration();
         var consoleTarget = new ConsoleTarget
@@ -27,5 +25,11 @@ public static void ClassInitialize(TestContext context)
 
         LogManager.Configuration = config;
     }
-    protected static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
+
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        TestPathHelpers.DeleteTestDirectory();
+        GC.SuppressFinalize(this);
+    }
 }