Migrate to xunit.v3.assert (#136)

ImmediatePlatform · Oct 18, 2024 · cfb783a · cfb783a
1 parent b010a8b
commit cfb783a
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 145 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,8 +17,8 @@
 	<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.2" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2" />
+	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
+	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
 	<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
@@ -29,8 +29,9 @@
 	<PackageVersion Include="Scriban" Version="5.10.0" />
 	<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
 	<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-	<PackageVersion Include="TUnit" Version="0.1.1043" />
+	<PackageVersion Include="TUnit.Engine" Version="0.1.1065" />
 	<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
 	<PackageVersion Include="Verify.TUnit" Version="27.0.1" />
+	<PackageVersion Include="xunit.v3.assert" Version="0.5.0-pre.27" />
   </ItemGroup>
 </Project>
diff --git a/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_A.cs b/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_A.cs
@@ -32,6 +32,6 @@ public async Task BehaviorShouldConstrain_A()
 
 		var behaviorWalker = serviceProvider.GetRequiredService<BehaviorWalker>();
 
-		_ = await Assert.That(behaviorWalker.BehaviorsRan).IsEquivalentCollectionTo(["BehaviorA"]);
+		Assert.Equal(["BehaviorA"], behaviorWalker.BehaviorsRan);
 	}
 }
diff --git a/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_B.cs b/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_B.cs
@@ -33,8 +33,6 @@ public async Task BehaviorShouldConstrain_B()
 
 		var behaviorWalker = serviceProvider.GetRequiredService<BehaviorWalker>();
 
-		_ = await Assert
-			.That(behaviorWalker.BehaviorsRan)
-			.IsEquivalentCollectionTo(["BehaviorA", "BehaviorB"]);
+		Assert.Equal(["BehaviorA", "BehaviorB"], behaviorWalker.BehaviorsRan);
 	}
 }
diff --git a/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_C.cs b/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_C.cs
@@ -33,8 +33,6 @@ public async Task BehaviorShouldConstrain_C()
 
 		var behaviorWalker = serviceProvider.GetRequiredService<BehaviorWalker>();
 
-		_ = await Assert
-			.That(behaviorWalker.BehaviorsRan)
-			.IsEquivalentCollectionTo(["BehaviorA", "BehaviorC"]);
+		Assert.Equal(["BehaviorA", "BehaviorC"], behaviorWalker.BehaviorsRan);
 	}
 }
diff --git a/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_D.cs b/...mmediate.Handlers.FunctionalTests/Behavior/Constraints/Tests.BehaviorShouldConstrain_D.cs
@@ -33,8 +33,6 @@ public async Task BehaviorShouldConstrain_D()
 
 		var behaviorWalker = serviceProvider.GetRequiredService<BehaviorWalker>();
 
-		_ = await Assert
-			.That(behaviorWalker.BehaviorsRan)
-			.IsEquivalentCollectionTo(["BehaviorA", "BehaviorB", "BehaviorD"]);
+		Assert.Equal(["BehaviorA", "BehaviorB", "BehaviorD"], behaviorWalker.BehaviorsRan);
 	}
 }
diff --git a/tests/Immediate.Handlers.FunctionalTests/HandlerAbstraction/HandlerAbstractionTests.cs b/tests/Immediate.Handlers.FunctionalTests/HandlerAbstraction/HandlerAbstractionTests.cs
@@ -28,6 +28,6 @@ public async Task NoBehaviorShouldReturnExpectedResponseForAbstraction()
 
 		var result = await handler.HandleAsync(query);
 
-		_ = await Assert.That(result).IsEqualTo(Input + 1);
+		Assert.Equal(Input + 1, result);
 	}
 }
diff --git a/tests/Immediate.Handlers.FunctionalTests/Immediate.Handlers.FunctionalTests.csproj b/tests/Immediate.Handlers.FunctionalTests/Immediate.Handlers.FunctionalTests.csproj
@@ -1,20 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-	  <RootNamespace>Immediate.Handlers.FunctionalTests</RootNamespace>
-	</PropertyGroup>
+  <PropertyGroup>
+	<RootNamespace>Immediate.Handlers.FunctionalTests</RootNamespace>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-		<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
-		<PackageReference Include="TUnit" />
-		<PackageReference Include="Verify.TUnit" />
-	</ItemGroup>
+  <ItemGroup Label="Usings">
+	<Using Include="Xunit" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="../../src/Immediate.Handlers.Shared/Immediate.Handlers.Shared.csproj" />
-		<ProjectReference Include="../../src/Immediate.Handlers.Generators/Immediate.Handlers.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	</ItemGroup>
+  <ItemGroup>
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+	<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
+	<PackageReference Include="TUnit.Engine" />
+	<PackageReference Include="Verify.TUnit" />
+	<PackageReference Include="xunit.v3.assert" />
+  </ItemGroup>
+
+  <ItemGroup>
+	<ProjectReference Include="../../src/Immediate.Handlers.Shared/Immediate.Handlers.Shared.csproj" />
+	<ProjectReference Include="../../src/Immediate.Handlers.Generators/Immediate.Handlers.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Immediate.Handlers.FunctionalTests/MultipleBehaviors/MultipleBehaviorsTests.cs b/tests/Immediate.Handlers.FunctionalTests/MultipleBehaviors/MultipleBehaviorsTests.cs
@@ -62,16 +62,17 @@ public async Task TestBehaviorOrdering()
 
 		_ = await handler.HandleAsync(query);
 
-		_ = await Assert
-			.That(query)
-			.IsEquivalentCollectionTo([
+		Assert.Equal(
+			[
 				"Behavior1.Enter",
 				"Behavior2.Enter",
 				"Behavior1.Enter",
 				"Query.HandleAsync",
 				"Behavior1.Exit",
 				"Behavior2.Exit",
 				"Behavior1.Exit",
-			]);
+			],
+			query
+		);
 	}
 }
diff --git a/tests/Immediate.Handlers.FunctionalTests/NoBehaviors/ParameterizedTests.cs b/tests/Immediate.Handlers.FunctionalTests/NoBehaviors/ParameterizedTests.cs
@@ -33,6 +33,6 @@ public async Task NoBehaviorShouldReturnExpectedResponse()
 
 		var result = await handler.HandleAsync(query);
 
-		_ = await Assert.That(result).IsEqualTo(Input + addendProvider.Addend);
+		Assert.Equal(Input + addendProvider.Addend, result);
 	}
 }
diff --git a/tests/Immediate.Handlers.FunctionalTests/NoBehaviors/ParameterlessTests.cs b/tests/Immediate.Handlers.FunctionalTests/NoBehaviors/ParameterlessTests.cs
@@ -41,7 +41,7 @@ public async Task NoBehaviorShouldReturnExpectedResponse()
 
 		var result = await handler.HandleAsync(query);
 
-		_ = await Assert.That(result).IsEqualTo(Input + 1);
+		Assert.Equal(Input + 1, result);
 	}
 
 	[Test]
@@ -55,6 +55,6 @@ public async Task NoTokenShouldReturnExpectedResponse()
 
 		var result = await handler.HandleAsync(query);
 
-		_ = await Assert.That(result).IsEqualTo(Input + 1);
+		Assert.Equal(Input + 1, result);
 	}
 }
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.cs
@@ -10,7 +10,7 @@ public sealed class BehaviorTests
 	[Arguments(DriverReferenceAssemblies.Msdi)]
 	public async Task SingleBehavior(DriverReferenceAssemblies assemblies)
 	{
-		var result = await GeneratorTestHelper.RunGenerator(
+		var result = GeneratorTestHelper.RunGenerator(
 			"""
 			using System.Collections.Generic;
 			using System.Linq;
@@ -70,9 +70,8 @@ public interface ILogger<T>;
 			assemblies
 		);
 
-		_ = await Assert
-			.That(result.GeneratedTrees.Select(t => t.FilePath.Replace("\\", "/", StringComparison.Ordinal)))
-			.IsEquivalentCollectionTo([
+		Assert.Equal(
+			[
 				"Immediate.Handlers.Generators/Immediate.Handlers.Generators.ImmediateHandlers.ImmediateHandlersGenerator/IH.Dummy.GetUsersQuery.g.cs",
 				.. assemblies switch
 				{
@@ -82,7 +81,9 @@ public interface ILogger<T>;
 
 					_ => throw new UnreachableException(),
 				},
-			]);
+			],
+			result.GeneratedTrees.Select(t => t.FilePath.Replace("\\", "/", StringComparison.Ordinal))
+		);
 
 		_ = await Verify(result)
 			.UseParameters(string.Join("_", assemblies));
@@ -93,7 +94,7 @@ public interface ILogger<T>;
 	[Arguments(DriverReferenceAssemblies.Msdi)]
 	public async Task MultipleBehaviors(DriverReferenceAssemblies assemblies)
 	{
-		var result = await GeneratorTestHelper.RunGenerator(
+		var result = GeneratorTestHelper.RunGenerator(
 			"""
 			using System.Collections.Generic;
 			using System.Linq;
@@ -218,9 +219,8 @@ public interface ILogger<T>;
 			assemblies
 		);
 
-		_ = await Assert
-			.That(result.GeneratedTrees.Select(t => t.FilePath.Replace("\\", "/", StringComparison.Ordinal)))
-			.IsEquivalentCollectionTo([
+		Assert.Equal(
+			[
 				"Immediate.Handlers.Generators/Immediate.Handlers.Generators.ImmediateHandlers.ImmediateHandlersGenerator/IH.Dummy.GetUsersQuery.g.cs",
 				.. assemblies switch
 				{
@@ -230,7 +230,9 @@ public interface ILogger<T>;
 
 					_ => throw new UnreachableException(),
 				},
-			]);
+			],
+			result.GeneratedTrees.Select(t => t.FilePath.Replace("\\", "/", StringComparison.Ordinal))
+		);
 
 		_ = await Verify(result)
 			.UseParameters(string.Join("_", assemblies));
@@ -241,7 +243,7 @@ public interface ILogger<T>;
 	[Arguments(DriverReferenceAssemblies.Msdi)]
 	public async Task CrtpBehavior(DriverReferenceAssemblies assemblies)
 	{
-		var result = await GeneratorTestHelper.RunGenerator(
+		var result = GeneratorTestHelper.RunGenerator(
 			"""
 			using System;
 			using System.Threading;
@@ -286,9 +288,8 @@ CancellationToken __
 			assemblies
 		);
 
-		_ = await Assert
-			.That(result.GeneratedTrees.Select(t => t.FilePath.Replace("\\", "/", StringComparison.Ordinal)))
-			.IsEquivalentCollectionTo([
+		Assert.Equal(
+			[
 				"Immediate.Handlers.Generators/Immediate.Handlers.Generators.ImmediateHandlers.ImmediateHandlersGenerator/IH..ConstraintHandler.g.cs",
 				.. assemblies switch
 				{
@@ -298,7 +299,9 @@ CancellationToken __
 
 					_ => throw new UnreachableException(),
 				},
-			]);
+			],
+			result.GeneratedTrees.Select(t => t.FilePath.Replace("\\", "/", StringComparison.Ordinal))
+		);
 
 		_ = await Verify(result)
 			.UseParameters(string.Join("_", assemblies));

diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/GeneratorTestHelper.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/GeneratorTestHelper.cs
@@ -8,7 +8,7 @@ namespace Immediate.Handlers.Tests.GeneratorTests;
 
 public static class GeneratorTestHelper
 {
-	public static async Task<GeneratorDriverRunResult> RunGenerator(
+	public static GeneratorDriverRunResult RunGenerator(
 		[StringSyntax("c#-test")] string source,
 		DriverReferenceAssemblies assemblies
 	)
@@ -38,16 +38,13 @@ .. assemblies.GetAdditionalReferences(),
 				out var diagnostics
 			);
 
-		_ = await Assert
-			.That(
-				outputCompilation
-					.GetDiagnostics()
-					.Where(d => d.Severity is DiagnosticSeverity.Error or DiagnosticSeverity.Warning)
-			)
-			.IsEmpty();
-
-		_ = await Assert.That(diagnostics).IsEmpty();
+		Assert.Empty(
+			outputCompilation
+				.GetDiagnostics()
+				.Where(d => d.Severity is DiagnosticSeverity.Error or DiagnosticSeverity.Warning)
+		);
 
+		Assert.Empty(diagnostics);
 		return driver.GetRunResult();
 	}
 }