Tunit (#432)

Author: SimonCropp

contributing.md

@@ -386,8 +386,8 @@ partial class PolyfillTests
         var memory = new Memory<char>(result);
         using var reader = new StreamReader(stream);
         var read = await reader.ReadAsync(memory);
-        Assert.AreEqual(5, read);
-        Assert.IsTrue("value".SequenceEqual(result));
+        await Assert.That(read).IsEqualTo(5);
+        await Assert.That("value".SequenceEqual(result)).IsTrue();
     }
 
     [Test]
@@ -396,7 +396,7 @@ partial class PolyfillTests
         using var stream = new MemoryStream("value"u8.ToArray());
         using var reader = new StreamReader(stream);
         var read = await reader.ReadToEndAsync(Cancel.None);
-        Assert.AreEqual("value", read);
+        await Assert.That(read).IsEqualTo("value");
     }
 
     [Test]
@@ -405,7 +405,7 @@ partial class PolyfillTests
         using var stream = new MemoryStream("line1\nline2"u8.ToArray());
         using var reader = new StreamReader(stream);
         var read = await reader.ReadLineAsync(Cancel.None);
-        Assert.AreEqual("line1", read);
+        await Assert.That(read).IsEqualTo("line1");
     }
 }
 ```

readme.md

@@ -96,14 +96,14 @@ Reference: [Module Initializers](https://learn.microsoft.com/en-us/dotnet/csharp
 static bool InitCalled;
 
 [Test]
-public void ModuleInitTest() =>
-    Assert.True(InitCalled);
+public async Task ModuleInitTest() =>
+    await Assert.That(InitCalled).IsTrue();
 
 [ModuleInitializer]
 public static void ModuleInit() =>
     InitCalled = true;
 ```
-<sup><a href='/src/Tests/ModuleInitSample.cs#L4-L16' title='Snippet source file'>snippet source</a> | <a href='#snippet-ModuleInitializerAttribute' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/ModuleInitSample.cs#L3-L15' title='Snippet source file'>snippet source</a> | <a href='#snippet-ModuleInitializerAttribute' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -225,25 +225,24 @@ If consuming in a project that targets net461 or net462, a reference to System.V
 <!-- snippet: IndexRange -->
 <a id='snippet-IndexRange'></a>
 ```cs
-[TestFixture]
 class IndexRangeSample
 {
     [Test]
-    public void Range()
+    public async Task Range()
     {
         var substring = "value"[2..];
-        Assert.AreEqual("lue", substring);
+        await Assert.That(substring).IsEqualTo("lue");
     }
 
     [Test]
-    public void Index()
+    public async Task Index()
     {
         var ch = "value"[^2];
-        Assert.AreEqual('u', ch);
+        await Assert.That(ch).IsEqualTo('u');
     }
 
     [Test]
-    public void ArrayIndex()
+    public async Task ArrayIndex()
     {
         var array = new[]
         {
@@ -253,11 +252,11 @@ class IndexRangeSample
 
         var value = array[^2];
 
-        Assert.AreEqual("value1", value);
+        await Assert.That(value).IsEqualTo("value1");
     }
 }
 ```
-<sup><a href='/src/Tests/IndexRangeSample.cs#L1-L35' title='Snippet source file'>snippet source</a> | <a href='#snippet-IndexRange' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/IndexRangeSample.cs#L1-L34' title='Snippet source file'>snippet source</a> | <a href='#snippet-IndexRange' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -278,15 +277,15 @@ class IndexRangeSample
 <!-- snippet: OverloadResolutionPriority -->
 <a id='snippet-OverloadResolutionPriority'></a>
 ```cs
-[TestFixture]
 public class OverloadResolutionPriorityAttributeTests
 {
     [Test]
-    public void Run()
+    public Task Run()
     {
         int[] arr = [1, 2, 3];
         //Prints "Span" because resolution priority is higher
         Method(arr);
+        return Task.CompletedTask;
     }
 
     [OverloadResolutionPriority(2)]
@@ -1487,7 +1486,7 @@ class NullabilityTarget
 <a id='snippet-NullabilityUsage'></a>
 ```cs
 [Test]
-public void Test()
+public async Task Test()
 {
     var type = typeof(NullabilityTarget);
     var arrayField = type.GetField("ArrayField")!;
@@ -1497,14 +1496,14 @@ public void Test()
 
     var arrayInfo = context.Create(arrayField);
 
-    Assert.AreEqual(NullabilityState.NotNull, arrayInfo.ReadState);
-    Assert.AreEqual(NullabilityState.Nullable, arrayInfo.ElementType!.ReadState);
+    await Assert.That(arrayInfo.ReadState).IsEqualTo(NullabilityState.NotNull);
+    await Assert.That(arrayInfo.ElementType!.ReadState).IsEqualTo(NullabilityState.Nullable);
 
     var genericInfo = context.Create(genericField);
 
-    Assert.AreEqual(NullabilityState.NotNull, genericInfo.ReadState);
-    Assert.AreEqual(NullabilityState.NotNull, genericInfo.GenericTypeArguments[0].ReadState);
-    Assert.AreEqual(NullabilityState.Nullable, genericInfo.GenericTypeArguments[1].ReadState);
+    await Assert.That(genericInfo.ReadState).IsEqualTo(NullabilityState.NotNull);
+    await Assert.That(genericInfo.GenericTypeArguments[0].ReadState).IsEqualTo(NullabilityState.NotNull);
+    await Assert.That(genericInfo.GenericTypeArguments[1].ReadState).IsEqualTo(NullabilityState.Nullable);
 }
 ```
 <sup><a href='/src/Tests/NullabilitySamples.cs#L6-L29' title='Snippet source file'>snippet source</a> | <a href='#snippet-NullabilityUsage' title='Start of snippet'>anchor</a></sup>

src/ApiBuilderTests/ApiBuilderTests.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="TUnit" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
     <PackageReference Include="ProjectFiles" />
   </ItemGroup>

src/ApiBuilderTests/BuildApiTest.cs

@@ -1,12 +1,11 @@
 using ProjectFilesGenerator;
 
-[TestFixture]
 public class BuildApiTest
 {
     static string polyfillDir = Path.Combine(ProjectFiles.SolutionDirectory, "Polyfill");
 
     [Test]
-    public void RunWithRoslyn()
+    public Task RunWithRoslyn()
     {
         var md = Path.Combine(ProjectFiles.SolutionDirectory, "..", "api_list.include.md");
         File.Delete(md);
@@ -29,6 +28,7 @@ public void RunWithRoslyn()
         var countMd = Path.Combine(ProjectFiles.SolutionDirectory, "..", "apiCount.include.md");
         File.Delete(countMd);
         File.WriteAllText(countMd, $"**API count: {count}**");
+        return Task.CompletedTask;
     }
 
     static int WriteExtensions(StreamWriter writer, int count)

src/ApiBuilderTests/GlobalUsings.cs

@@ -1,4 +1,6 @@
-global using NUnit.Framework;
+global using TUnit.Core;
+global using TUnit.Assertions;
+global using TUnit.Assertions.Extensions;
 global using System;
 global using System.Diagnostics.CodeAnalysis;
 global using Microsoft.CodeAnalysis;

src/ConsumeOnlyTasks/ConsumeOnlyTasks.csproj

@@ -6,8 +6,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Threading.Tasks.Extensions" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="..\Consume\*.cs" />
   </ItemGroup>
   <Import Project="$(SolutionDir)\TestIncludes.targets" />

src/Directory.Packages.props

@@ -6,10 +6,7 @@
   <ItemGroup>
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="28.0.0-beta.8" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" Pinned="true" />
-    <!-- keep at 17.14.1 -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" Pinned="true" />
-    <PackageVersion Include="NUnit" Version="3.14.0" Pinned="true" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" Pinned="true" />
+    <PackageVersion Include="TUnit" Version="1.5.53" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.163" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.1" />
     <PackageVersion Include="ProjectFiles" Version="0.2.0" />

src/EmbeddedTests/EmbeddedTests.csproj

@@ -1,25 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
+    <OutputType>Exe</OutputType>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net472;net48</TargetFrameworks>
     <TargetFrameworks>$(TargetFrameworks);netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     <PolyUseEmbeddedAttribute>true</PolyUseEmbeddedAttribute>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Tests\*.cs" />
+    <PackageReference Include="TUnit" />
     <PackageReference Include="ProjectFiles" />
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
     <PackageReference Include="System.Memory" Condition="$(TargetFramework) != '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
     <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
     <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Condition="$(TargetFramework.StartsWith('net4'))" />
     <PackageReference Include="System.IO.Compression" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\ConsumeEmbeddedLib\ConsumeEmbeddedLib.csproj" />
   </ItemGroup>
   <Import Project="$(SolutionDir)\TestIncludes.targets" />

src/NoExtrasTests/GlobalUsings.cs

@@ -1 +1,3 @@
-global using NUnit.Framework;
+global using TUnit.Core;
+global using TUnit.Assertions;
+global using TUnit.Assertions.Extensions;

src/NoExtrasTests/NoExtrasTests.csproj

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
     <TargetFramework>net10.0</TargetFramework>
     <PolyEnsure>false</PolyEnsure>
@@ -10,9 +11,7 @@
     <RootNamespace>NoExtras</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="TUnit" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
   </ItemGroup>
   <Import Project="$(SolutionDir)\TestIncludes.targets" />