Switching to TUnit

Author: distantcam

src/AutoCtor.Tests/AutoCtor.Tests.csproj

@@ -46,15 +46,10 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="TUnit" />
     <PackageReference Include="Verify.DiffPlex" />
     <PackageReference Include="Verify.SourceGenerators" />
-    <PackageReference Include="Verify.XunitV3" />
-    <PackageReference Include="xunit.analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="Verify.TUnit" />
   </ItemGroup>
 
   <ItemGroup>

src/AutoCtor.Tests/ExampleTests.cs

@@ -8,8 +8,8 @@ namespace AutoCtor.Tests;
 
 public class ExampleTests
 {
-    [Theory]
-    [MemberData(nameof(GetExamples))]
+    [Test]
+    [MethodDataSource(nameof(GetExamples))]
     public async Task ExamplesGeneratedCode(CodeFileTheoryData theoryData)
     {
         var builder = CreateCompilation(theoryData);
@@ -18,16 +18,16 @@ public async Task ExamplesGeneratedCode(CodeFileTheoryData theoryData)
             .AddGenerator(new AutoConstructSourceGenerator())
             .WithAnalyzerOptions(theoryData.Options)
             .Build(builder.ParseOptions)
-            .RunGenerators(compilation, TestContext.Current.CancellationToken);
+            .RunGenerators(compilation, TestHelper.CancellationToken);
 
         await Verify(driver)
             .UseDirectory(theoryData.VerifiedDirectory)
             .UseTypeName(theoryData.Name)
             .IgnoreParametersForVerified();
     }
 
-    [Theory]
-    [MemberData(nameof(GetExamples))]
+    [Test]
+    [MethodDataSource(nameof(GetExamples))]
     public async Task CodeCompilesProperly(CodeFileTheoryData theoryData)
     {
         var builder = CreateCompilation(theoryData);
@@ -40,15 +40,16 @@ public async Task CodeCompilesProperly(CodeFileTheoryData theoryData)
                 compilation,
                 out var outputCompilation,
                 out _,
-                TestContext.Current.CancellationToken);
+                TestHelper.CancellationToken);
 
-        Assert.Empty(outputCompilation.GetDiagnostics(TestContext.Current.CancellationToken)
-            .Where(d => !theoryData.IgnoredCompileDiagnostics.Contains(d.Id)));
+        await Assert.That(outputCompilation.GetDiagnostics(TestHelper.CancellationToken)
+            .Where(d => !theoryData.IgnoredCompileDiagnostics.Contains(d.Id)))
+            .IsEmpty();
     }
 
 #if ROSLYN_4_4
-    [Theory]
-    [MemberData(nameof(GetExamples))]
+    [Test]
+    [MethodDataSource(nameof(GetExamples))]
     public async Task EnsureRunsAreCachedCorrectly(CodeFileTheoryData theoryData)
     {
         var builder = CreateCompilation(theoryData);
@@ -59,20 +60,20 @@ public async Task EnsureRunsAreCachedCorrectly(CodeFileTheoryData theoryData)
             .WithAnalyzerOptions(theoryData.Options)
             .Build(builder.ParseOptions);
 
-        driver = driver.RunGenerators(compilation, TestContext.Current.CancellationToken);
+        driver = driver.RunGenerators(compilation, TestHelper.CancellationToken);
         var firstResult = driver.GetRunResult();
 
         // Change the compilation
         compilation = compilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText("// dummy",
             CSharpParseOptions.Default.WithLanguageVersion(theoryData.LangPreview
                 ? LanguageVersion.Preview
                 : LanguageVersion.Latest),
-            cancellationToken: TestContext.Current.CancellationToken));
+            cancellationToken: TestHelper.CancellationToken));
 
-        driver = driver.RunGenerators(compilation, TestContext.Current.CancellationToken);
+        driver = driver.RunGenerators(compilation, TestHelper.CancellationToken);
         var secondResult = driver.GetRunResult();
 
-        AssertRunsEqual(firstResult, secondResult,
+        await AssertRunsEqual(firstResult, secondResult,
             AutoConstructSourceGenerator.TrackingNames.AllTrackers);
     }
 #endif
@@ -99,39 +100,35 @@ private static CompilationBuilder CreateCompilation(CodeFileTheoryData theoryDat
 
     private static IEnumerable<string> GetExamplesFiles(string path) => Directory.GetFiles(Path.Combine(BaseDir?.FullName ?? "", path), "*.cs").Where(e => !e.Contains(".g."));
 
-    public static TheoryData<CodeFileTheoryData> GetExamples()
+    public static IEnumerable<CodeFileTheoryData> GetExamples()
     {
         if (BaseDir == null)
             throw new Exception("BaseDir is null");
 
-        var data = new TheoryData<CodeFileTheoryData>();
-
         foreach (var example in GetExamplesFiles("Examples"))
         {
-            data.Add(new CodeFileTheoryData(example) with
+            yield return new CodeFileTheoryData(example) with
             {
                 IgnoredCompileDiagnostics = ["CS0414", "CS0169"] // Ignore unused fields
-            });
+            };
         }
 
         foreach (var guardExample in GetExamplesFiles("GuardExamples"))
         {
-            data.Add(new CodeFileTheoryData(guardExample) with
+            yield return new CodeFileTheoryData(guardExample) with
             {
                 Options = new() { { "build_property.AutoCtorGuards", "true" } }
-            });
+            };
         }
 
         foreach (var langExample in GetExamplesFiles("LangExamples"))
         {
             var verifiedName = string.Concat("Verified_", PreprocessorSymbols.Last().AsSpan(7));
-            data.Add(new CodeFileTheoryData(langExample) with
+            yield return new CodeFileTheoryData(langExample) with
             {
                 VerifiedDirectory = Path.Combine(Path.GetDirectoryName(langExample) ?? "", verifiedName),
                 LangPreview = true,
-            });
+            };
         }
-
-        return data;
     }
 }

src/AutoCtor.Tests/GeneratedAttributeTests.cs

@@ -2,7 +2,7 @@
 
 public class GeneratedAttributeTests
 {
-    [Fact]
+    [Test]
     public async Task AttributeGeneratedCode()
     {
         var builder = new CompilationBuilder()
@@ -12,12 +12,12 @@ public async Task AttributeGeneratedCode()
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AttributeSourceGenerator())
             .Build(builder.ParseOptions)
-            .RunGenerators(compilation, TestContext.Current.CancellationToken);
+            .RunGenerators(compilation, TestHelper.CancellationToken);
 
         await Verify(driver);
     }
 
-    [Fact]
+    [Test]
     public async Task AttributeCompilesProperly()
     {
         var builder = new CompilationBuilder()
@@ -31,13 +31,16 @@ public async Task AttributeCompilesProperly()
                 compilation,
                 out var outputCompilation,
                 out var diagnostics,
-                TestContext.Current.CancellationToken);
+                TestHelper.CancellationToken);
 
-        Assert.Empty(diagnostics);
-        Assert.Empty(outputCompilation.GetDiagnostics(TestContext.Current.CancellationToken));
+        var outputCompilationDiagnostics = outputCompilation
+            .GetDiagnostics(TestHelper.CancellationToken);
+
+        await Assert.That(diagnostics).IsEmpty();
+        await Assert.That(outputCompilationDiagnostics).IsEmpty();
     }
 
-    [Fact]
+    [Test]
     public async Task PreserveAttributesTest()
     {
         var builder = new CompilationBuilder()
@@ -54,13 +57,16 @@ public async Task PreserveAttributesTest()
                 compilation,
                 out var outputCompilation,
                 out var diagnostics,
-                TestContext.Current.CancellationToken);
+                TestHelper.CancellationToken);
+
+        var outputCompilationDiagnostics = outputCompilation
+            .GetDiagnostics(TestHelper.CancellationToken);
 
-        Assert.Empty(diagnostics);
-        Assert.Empty(outputCompilation.GetDiagnostics(TestContext.Current.CancellationToken));
+        await Assert.That(diagnostics).IsEmpty();
+        await Assert.That(outputCompilationDiagnostics).IsEmpty();
     }
 
-    [Fact]
+    [Test]
     public async Task EnsureGeneratedAttributesAreNotExternallyVisible()
     {
         // Issue 312
@@ -75,7 +81,7 @@ public async Task EnsureGeneratedAttributesAreNotExternallyVisible()
         var projectA = await compileBuilder
             .Build("ProjectA");
 
-        genDriver = genDriver.RunGeneratorsAndUpdateCompilation(projectA, out var genProjectA, out _, TestContext.Current.CancellationToken);
+        genDriver = genDriver.RunGeneratorsAndUpdateCompilation(projectA, out var genProjectA, out _, TestHelper.CancellationToken);
 
         var projectB = await compileBuilder
             .AddCompilationReference(genProjectA)
@@ -85,9 +91,12 @@ public async Task EnsureGeneratedAttributesAreNotExternallyVisible()
             projectB,
             out var outputCompilation,
             out var diagnostics,
-            TestContext.Current.CancellationToken);
+            TestHelper.CancellationToken);
+
+        var outputCompilationDiagnostics = outputCompilation
+            .GetDiagnostics(TestHelper.CancellationToken);
 
-        Assert.Empty(diagnostics);
-        Assert.Empty(outputCompilation.GetDiagnostics(TestContext.Current.CancellationToken));
+        await Assert.That(diagnostics).IsEmpty();
+        await Assert.That(outputCompilationDiagnostics).IsEmpty();
     }
 }

src/AutoCtor.Tests/Issue73.cs

@@ -5,20 +5,20 @@ namespace AutoCtor.Tests;
 
 public class Issue73
 {
-    [Fact]
+    [Test]
     public async Task VerifyGeneratedCode()
     {
         var common = Common();
         var compilation = await Compile(common);
         var driver = new GeneratorDriverBuilder()
             .AddGenerator(new AutoConstructSourceGenerator())
             .Build(common.ParseOptions)
-            .RunGenerators(compilation, TestContext.Current.CancellationToken);
+            .RunGenerators(compilation, TestHelper.CancellationToken);
 
         await Verify(driver);
     }
 
-    [Fact]
+    [Test]
     public async Task CodeCompilesWithoutErrors()
     {
         string[] ignoredWarnings = ["CS0414"]; // Ignore unused fields
@@ -32,11 +32,14 @@ public async Task CodeCompilesWithoutErrors()
                 compilation,
                 out var outputCompilation,
                 out var diagnostics,
-                TestContext.Current.CancellationToken);
+                TestHelper.CancellationToken);
 
-        Assert.Empty(diagnostics);
-        Assert.Empty(outputCompilation.GetDiagnostics(TestContext.Current.CancellationToken)
-            .Where(d => !ignoredWarnings.Contains(d.Id)));
+        var outputCompilationDiagnostics = outputCompilation
+            .GetDiagnostics(TestHelper.CancellationToken)
+            .Where(d => !ignoredWarnings.Contains(d.Id));
+
+        await Assert.That(diagnostics).IsEmpty();
+        await Assert.That(outputCompilationDiagnostics).IsEmpty();
     }
 
     private static CompilationBuilder Common()

src/AutoCtor.Tests/Utilities/CodeFileTheoryData.cs

@@ -1,8 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis;
-using Xunit.Sdk;
 
-public record CodeFileTheoryData : IXunitSerializable
+public record CodeFileTheoryData
 {
     public required string Name { get; set; }
     public required string[] Codes { get; set; }
@@ -20,34 +18,5 @@ public CodeFileTheoryData(string file, params string[] codes)
         VerifiedDirectory = Path.GetDirectoryName(file) ?? "";
     }
 
-    public CodeFileTheoryData() { }
-
-    public void Deserialize(IXunitSerializationInfo info)
-    {
-        Name = info.GetValue<string>(nameof(Name))
-            ?? throw new Exception($"Missing {nameof(Name)} in theory serialization");
-        Codes = info.GetValue<string[]>(nameof(Codes))
-            ?? throw new Exception($"Missing {nameof(Codes)} in theory serialization");
-        VerifiedDirectory = info.GetValue<string>(nameof(VerifiedDirectory))
-            ?? throw new Exception($"Missing {nameof(VerifiedDirectory)} in theory serialization");
-        Options = info.GetValue<string[]>(nameof(Options))?
-            .Select(o => o.Split('|'))
-            .ToDictionary(o => o[0], o => o[1])
-            ?? throw new Exception($"Missing {nameof(Options)} in theory serialization");
-        LangPreview = info.GetValue<bool>(nameof(LangPreview));
-        IgnoredCompileDiagnostics = info.GetValue<string[]>(nameof(IgnoredCompileDiagnostics))
-            ?? throw new Exception($"Missing {nameof(IgnoredCompileDiagnostics)} in theory serialization");
-    }
-
-    public void Serialize(IXunitSerializationInfo info)
-    {
-        info.AddValue(nameof(Name), Name);
-        info.AddValue(nameof(Codes), Codes);
-        info.AddValue(nameof(VerifiedDirectory), VerifiedDirectory);
-        info.AddValue(nameof(Options), Options.Select(o => $"{o.Key}|{o.Value}").ToArray());
-        info.AddValue(nameof(LangPreview), LangPreview);
-        info.AddValue(nameof(IgnoredCompileDiagnostics), IgnoredCompileDiagnostics);
-    }
-
     public override string ToString() => Name + ".cs";
 }