Skip to content

Commit 6715d6b

Browse files
committed
Use Verify.Xunit instead of ApprovalTests
The VerifyTests API when using a theory is easier to use than the ApprovalTests. Also, the Public API approval test is much easier to write thanks to the `UseFileName` method.
1 parent 6eee322 commit 6715d6b

File tree

58 files changed

+77
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+77
-98
lines changed

tests/Log4NetTextFormatterTest.cs

Lines changed: 70 additions & 78 deletions
Large diffs are not rendered by default.

tests/PublicApi.cs

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
1-
using System.IO;
2-
using System.Reflection;
3-
using ApprovalTests;
4-
using ApprovalTests.Namers;
5-
using ApprovalTests.Reporters;
1+
using System.Threading.Tasks;
62
using PublicApiGenerator;
3+
using VerifyXunit;
74
using Xunit;
85

96
namespace Serilog.Formatting.Log4Net.Tests
107
{
8+
[UsesVerify]
119
public class PublicApi
1210
{
1311
[Fact]
14-
public void ApprovePublicApi()
12+
public Task ApprovePublicApi()
1513
{
16-
var assembly = typeof(Log4NetTextFormatter).Assembly;
17-
var publicApi = assembly.GeneratePublicApi();
18-
var writer = new ApprovalTextWriter(publicApi);
19-
Approvals.Verify(writer, new AssemblyNamer(assembly), DiffReporter.INSTANCE);
20-
}
21-
22-
private class AssemblyNamer : UnitTestFrameworkNamer
23-
{
24-
private readonly Assembly _assembly;
25-
26-
public AssemblyNamer(Assembly assembly) => _assembly = assembly;
27-
28-
public override string Name => nameof(PublicApi) + "." + Path.GetFileNameWithoutExtension(_assembly.Location);
14+
var publicApi = typeof(Log4NetTextFormatter).Assembly.GeneratePublicApi();
15+
return Verifier.Verify(publicApi).UseFileName("PublicApi");
2916
}
3017
}
3118
}

tests/Serilog.Formatting.Log4Net.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="ApprovalTests" Version="5.7.0" />
1211
<PackageReference Include="coverlet.msbuild" Version="3.1.0" PrivateAssets="all" />
1312
<PackageReference Include="FluentAssertions" Version="6.1.0" />
1413
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1514
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
1615
<PackageReference Include="ReportGenerator" Version="4.8.12" />
1716
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
1817
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
18+
<PackageReference Include="Verify.Xunit" Version="13.3.0" />
1919
<PackageReference Include="xunit" Version="2.4.1" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2121
</ItemGroup>

0 commit comments

Comments
 (0)