Внедрение ITestOutputHelper через xUnit DI +semver:skip (#116)

* Внедрение ITestOutputHelper через xUnit DI * re ident 4 spaces
Stepami · Oct 9, 2024 · d29fb72 · d29fb72
1 parent c36f9bf
commit d29fb72
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
@@ -9,6 +9,7 @@
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageVersion Include="NSubstitute" Version="5.1.0" />
         <PackageVersion Include="xunit" Version="2.9.0" />
+        <PackageVersion Include="Xunit.DependencyInjection" Version="9.4.0" />
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 </Project>
diff --git a/tests/HydraScript.IntegrationTests/ErrorPrograms/VariableInitializationTests.cs b/tests/HydraScript.IntegrationTests/ErrorPrograms/VariableInitializationTests.cs
@@ -1,19 +1,16 @@
 using System.CommandLine.Parsing;
 using FluentAssertions;
-using Xunit.Abstractions;
 
 namespace HydraScript.IntegrationTests.ErrorPrograms;
 
-public class VariableInitializationTests(
-    TestHostFixture fixture,
-    ITestOutputHelper testOutputHelper) : IClassFixture<TestHostFixture>
+public class VariableInitializationTests(TestHostFixture fixture) : IClassFixture<TestHostFixture>
 {
     [Theory, MemberData(nameof(VariableInitializationScripts))]
     public void VariableWithoutTypeDeclared_AccessedBeforeInitialization_ExitCodeHydraScriptError(string script)
     {
         var runner = fixture.GetRunner(
-            testOutputHelper,
-            configureTestServices: services => services.SetupInMemoryScript(script));
+            configureTestServices: services =>
+                services.SetupInMemoryScript(script));
         var code = runner.Invoke(fixture.InMemoryScript);
         code.Should().Be(ExitCodes.HydraScriptError);
         fixture.LogMessages.Should()

diff --git a/tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj b/tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj
@@ -1,12 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <NoWarn>CA1816</NoWarn>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="FluentAssertions" />
         <PackageReference Include="MartinCostello.Logging.XUnit" />
         <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="NSubstitute" />
         <PackageReference Include="xunit" />
+        <PackageReference Include="Xunit.DependencyInjection" />
         <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

diff --git a/tests/HydraScript.IntegrationTests/Startup.cs b/tests/HydraScript.IntegrationTests/Startup.cs
@@ -0,0 +1,7 @@
+namespace HydraScript.IntegrationTests;
+
+// ReSharper disable once UnusedType.Global
+/// <summary>
+/// https://github.com/pengweiqhca/Xunit.DependencyInjection#4-default-startup
+/// </summary>
+public class Startup;
diff --git a/tests/HydraScript.IntegrationTests/SuccessfulProgramsTests.cs b/tests/HydraScript.IntegrationTests/SuccessfulProgramsTests.cs
@@ -1,17 +1,14 @@
 using System.CommandLine.Parsing;
 using FluentAssertions;
-using Xunit.Abstractions;
 
 namespace HydraScript.IntegrationTests;
 
-public class SuccessfulProgramsTests(
-    TestHostFixture fixture,
-    ITestOutputHelper testOutputHelper) : IClassFixture<TestHostFixture>
+public class SuccessfulProgramsTests(TestHostFixture fixture) : IClassFixture<TestHostFixture>
 {
     [Theory, MemberData(nameof(SuccessfulProgramsNames))]
     public void Invoke_NoError_ReturnCodeIsZero(string fileName)
     {
-        var runner = fixture.GetRunner(testOutputHelper);
+        var runner = fixture.GetRunner();
         var code = runner.Invoke([$"Samples/{fileName}"]);
         code.Should().Be(ExitCodes.Success);
     }

diff --git a/tests/HydraScript.IntegrationTests/TestHostFixture.cs b/tests/HydraScript.IntegrationTests/TestHostFixture.cs
@@ -1,26 +1,33 @@
 using System.CommandLine.Hosting;
 using System.CommandLine.Parsing;
 using HydraScript.Infrastructure;
+using MartinCostello.Logging.XUnit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
 namespace HydraScript.IntegrationTests;
 
-public class TestHostFixture : IDisposable
+public class TestHostFixture(
+    Xunit.DependencyInjection.ITestOutputHelperAccessor accessor) :
+    IDisposable, ITestOutputHelperAccessor
 {
     private readonly List<string> _logMessages = [];
 
     public readonly string[] InMemoryScript = ["file.js"];
     public IReadOnlyCollection<string> LogMessages => _logMessages;
 
-    public Parser GetRunner(
-        ITestOutputHelper testOutputHelper,
-        Action<IServiceCollection>? configureTestServices = null) =>
+    public ITestOutputHelper? OutputHelper
+    {
+        get => accessor.Output;
+        set { }
+    }
+
+    public Parser GetRunner(Action<IServiceCollection>? configureTestServices = null) =>
         Program.GetRunner(configureHost: builder => builder
                 .ConfigureLogging(x => x.ClearProviders()
-                    .AddXUnit(testOutputHelper)
+                    .AddXUnit(this)
                     .AddFakeLogging(options =>
                     {
                         options.OutputSink = logMessage => _logMessages.Add(logMessage);