#175 - Refactoring to xunit.v3 +semver:none (#176)

Stepami · web-flow · commit 8d45d182f6f5 · 2025-09-20T02:52:10.000+03:00
* #175 - change packages to v3 * #175 - enable MTP runner * #175 - fix build * #175 - update ci/cd
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -52,16 +52,16 @@ jobs:
       - name: Build
         run: dotnet build /p:Version=${{ steps.version_step.outputs.fullSemVer }} --no-restore -c Debug -v n
       - name: Unit Tests
-        run: dotnet test -c Debug --no-build -v n --filter="Category=Unit"
+        run: dotnet test -c Debug --no-build -v n -- --filter-trait Category=Unit --ignore-exit-code 8
       - name: Integration Tests
         run: |
-          dotnet test -c Debug /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --no-build -v n --filter="Category=Integration"
+          dotnet test tests/HydraScript.IntegrationTests -c Debug --no-build -v n -- --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml
           mkdir coverage-report
       - name: Code Coverage Summary Report For Merge Request
         if: github.event_name == 'pull_request'
         uses: 5monkeys/cobertura-action@master
         with:
-          path: ./tests/HydraScript.IntegrationTests/coverage.cobertura.xml
+          path: ./tests/HydraScript.IntegrationTests/bin/Debug/net9.0/TestResults/coverage.cobertura.xml
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           minimum_coverage: 80
           fail_below_threshold: true
@@ -73,7 +73,7 @@ jobs:
       - name: ReportGenerator
         uses: danielpalme/ReportGenerator-GitHub-Action@5.2.1
         with:
-          reports: './tests/HydraScript.IntegrationTests/coverage.cobertura.xml' 
+          reports: './tests/HydraScript.IntegrationTests/bin/Debug/net9.0/TestResults/coverage.cobertura.xml' 
           targetdir: './coverage-report' 
       - name: Upload coverage report artifact
         if: github.event_name == 'push'
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -3,15 +3,13 @@
 
     <PropertyGroup>
         <IsTestProject>true</IsTestProject>
+        <OutputType>Exe</OutputType>
+        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+        <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="xunit.v3" />
         <PackageReference Include="NSubstitute" />
     </ItemGroup>
 
diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
@@ -2,29 +2,16 @@
   <ItemGroup>
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
-    <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageVersion>
-    <PackageVersion Include="coverlet.msbuild" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageVersion>
+    <PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0" />
     <PackageVersion Include="Fare" Version="2.2.1" />
     <PackageVersion Include="AwesomeAssertions" Version="8.2.0" />
-    <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.5.1" />
+    <PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.4.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="PolymorphicContracts.AutoFixture" Version="2.0.0" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="Xunit.DependencyInjection" Version="9.9.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageVersion>
+    <PackageVersion Include="xunit.v3" Version="3.0.1" />
   </ItemGroup>
 </Project>
diff --git a/tests/HydraScript.Infrastructure.LexerRegexGenerator.UnitTests/PatternGeneratorTests.cs b/tests/HydraScript.Infrastructure.LexerRegexGenerator.UnitTests/PatternGeneratorTests.cs
@@ -4,7 +4,6 @@
 using Microsoft.CodeAnalysis.CSharp;
 using NSubstitute;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace HydraScript.Infrastructure.LexerRegexGenerator.UnitTests;
 
@@ -13,6 +12,7 @@ public class PatternGeneratorTests(ITestOutputHelper output)
     [Fact, Trait("Category", "Unit")]
     public void Initialize_PatternContainerMarked_CorrectlyGenerated()
     {
+        var ct = TestContext.Current.CancellationToken;
         var provider = Substitute.For<ITokenTypesStreamProvider>();
         provider.TokenTypesStream.Returns(
         [
@@ -25,8 +25,11 @@ public void Initialize_PatternContainerMarked_CorrectlyGenerated()
         };
         GeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
 
-        driver = driver.RunGeneratorsAndUpdateCompilation(CreateCompilation(string.Empty), out var outputCompilation,
-            out var diagnostics);
+        driver = driver.RunGeneratorsAndUpdateCompilation(
+            CreateCompilation(string.Empty),
+            out var outputCompilation,
+            out var diagnostics,
+            ct);
         Debug.Assert(diagnostics.IsEmpty);
         Debug.Assert(outputCompilation.SyntaxTrees.Count() == 2);
 
@@ -51,10 +54,10 @@ internal partial class PatternContainer
 
 """";
 
-        output.WriteLine(generatedFileSyntax.GetText().ToString());
+        output.WriteLine(generatedFileSyntax.GetText(ct).ToString());
         Assert.Equal(
             expectedSource,
-            generatedFileSyntax.GetText().ToString(),
+            generatedFileSyntax.GetText(ct).ToString(),
             ignoreLineEndingDifferences: true);
     }
 
diff --git a/tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj b/tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj
@@ -6,17 +6,9 @@
 
     <ItemGroup>
         <PackageReference Include="AwesomeAssertions" />
-        <PackageReference Include="MartinCostello.Logging.XUnit" />
+        <PackageReference Include="MartinCostello.Logging.XUnit.v3" />
         <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
-        <PackageReference Include="Xunit.DependencyInjection" />
-        <PackageReference Include="coverlet.collector">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="coverlet.msbuild">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/HydraScript.IntegrationTests/Properties/AssemblyInfo.cs b/tests/HydraScript.IntegrationTests/Properties/AssemblyInfo.cs
diff --git a/tests/HydraScript.IntegrationTests/Startup.cs b/tests/HydraScript.IntegrationTests/Startup.cs
diff --git a/tests/HydraScript.IntegrationTests/TestHostFixture.cs b/tests/HydraScript.IntegrationTests/TestHostFixture.cs
@@ -4,13 +4,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
-using Xunit.Abstractions;
 
 namespace HydraScript.IntegrationTests;
 
-public class TestHostFixture(
-    Xunit.DependencyInjection.ITestOutputHelperAccessor accessor) :
-    IDisposable, ITestOutputHelperAccessor
+public class TestHostFixture : IDisposable, ITestOutputHelperAccessor
 {
     public record Options(
         string FileName = ScriptFileName + ".js",
@@ -37,7 +34,7 @@ public void Dispose()
 
     public ITestOutputHelper? OutputHelper
     {
-        get => accessor.Output;
+        get => TestContext.Current.TestOutputHelper;
         set { }
     }
 
diff --git a/tests/HydraScript.UnitTests/AutoHydraScriptDataAttribute.cs b/tests/HydraScript.UnitTests/AutoHydraScriptDataAttribute.cs
@@ -1,6 +1,6 @@
 using AutoFixture;
 using AutoFixture.AutoNSubstitute;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using HydraScript.Domain.FrontEnd.Lexer;
 using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.IR;
diff --git a/tests/HydraScript.UnitTests/Domain/BackEnd/VirtualMachineTests.cs b/tests/HydraScript.UnitTests/Domain/BackEnd/VirtualMachineTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using HydraScript.Domain.BackEnd;
 using HydraScript.Domain.BackEnd.Impl;
 using HydraScript.Domain.BackEnd.Impl.Addresses;
diff --git a/tests/HydraScript.UnitTests/Domain/FrontEnd/LexerData.cs b/tests/HydraScript.UnitTests/Domain/FrontEnd/LexerData.cs
@@ -1,6 +1,6 @@
 namespace HydraScript.UnitTests.Domain.FrontEnd;
 
-public class LexerSuccessData : TheoryData<string>
+public sealed class LexerSuccessData : TheoryData<string>
 {
     public LexerSuccessData()
     {
@@ -10,7 +10,7 @@ public LexerSuccessData()
     }
 }
 
-public class LexerFailData : TheoryData<string>
+public sealed class LexerFailData : TheoryData<string>
 {
     public LexerFailData()
     {
@@ -20,7 +20,7 @@ public LexerFailData()
     }
 }
 
-public class LexerKeywordInsideIdentData : TheoryData<string>
+public sealed class LexerKeywordInsideIdentData : TheoryData<string>
 {
     public LexerKeywordInsideIdentData()
     {
diff --git a/tests/HydraScript.UnitTests/Domain/FrontEnd/RegexLexerTests.cs b/tests/HydraScript.UnitTests/Domain/FrontEnd/RegexLexerTests.cs
@@ -1,10 +1,9 @@
 using System.Text.RegularExpressions;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using HydraScript.Domain.FrontEnd.Lexer;
 using HydraScript.Domain.FrontEnd.Lexer.Impl;
 using HydraScript.Domain.FrontEnd.Lexer.TokenTypes;
 using HydraScript.Infrastructure;
-using Xunit.Abstractions;
 
 namespace HydraScript.UnitTests.Domain.FrontEnd;
 
diff --git a/tests/HydraScript.UnitTests/HydraScript.UnitTests.csproj b/tests/HydraScript.UnitTests/HydraScript.UnitTests.csproj
@@ -2,7 +2,7 @@
 
     <ItemGroup>
         <PackageReference Include="AutoFixture.AutoNSubstitute" />
-        <PackageReference Include="AutoFixture.Xunit2" />
+        <PackageReference Include="AutoFixture.Xunit3" />
         <PackageReference Include="Fare" />
         <PackageReference Include="AwesomeAssertions" />
         <PackageReference Include="PolymorphicContracts.AutoFixture" />
diff --git a/tests/HydraScript.UnitTests/Properties/AssemblyInfo.cs b/tests/HydraScript.UnitTests/Properties/AssemblyInfo.cs
@@ -1 +1 @@
-[assembly: AssemblyTrait("Category", "Unit")]
+[assembly: Trait("Category", "Unit")]

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,10 @@`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`using Microsoft.Extensions.Logging;`
`6`	`6`	`using NSubstitute;`
`7`		`-using Xunit.Abstractions;`
`8`	`7`
`9`	`8`	`namespace HydraScript.IntegrationTests;`
`10`	`9`
`11`		`-public class TestHostFixture(`
`12`		`- Xunit.DependencyInjection.ITestOutputHelperAccessor accessor) :`
`13`		`- IDisposable, ITestOutputHelperAccessor`
	`10`	`+public class TestHostFixture : IDisposable, ITestOutputHelperAccessor`
`14`	`11`	`{`
`15`	`12`	`public record Options(`
`16`	`13`	`string FileName = ScriptFileName + ".js",`
`@@ -37,7 +34,7 @@ public void Dispose()`
`37`	`34`
`38`	`35`	`public ITestOutputHelper? OutputHelper`
`39`	`36`	`{`
`40`		`- get => accessor.Output;`
	`37`	`+ get => TestContext.Current.TestOutputHelper;`
`41`	`38`	`set { }`
`42`	`39`	`}`
`43`	`40`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using AutoFixture.Xunit2;`
	`1`	`+using AutoFixture.Xunit3;`
`2`	`2`	`using HydraScript.Domain.BackEnd;`
`3`	`3`	`using HydraScript.Domain.BackEnd.Impl;`
`4`	`4`	`using HydraScript.Domain.BackEnd.Impl.Addresses;`