refactor(test): migrate to xUnit v3

Directory.Build.props

@@ -33,6 +33,7 @@
     <IncludeSource>false</IncludeSource>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors>$(WarningsAsErrors);nullable</WarningsAsErrors>
     <ImplicitUsings>enable</ImplicitUsings>

Directory.Packages.props

@@ -112,14 +112,12 @@
     <PackageVersion Include="Testcontainers" Version="4.10.0" />
     <PackageVersion Include="Testcontainers.Consul" Version="4.10.0" />
     <PackageVersion Include="Utf8Json" Version="1.3.7" />
-    <PackageVersion Include="Verify.Xunit" Version="29.5.0" />
-    <PackageVersion Include="xunit.assert" Version="2.9.3" />
-    <PackageVersion Include="xunit.core" Version="2.9.3" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
+    <PackageVersion Include="Verify.XunitV3" Version="29.5.0" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+    <PackageVersion Include="xunit.v3.assert" Version="3.2.2" />
+    <PackageVersion Include="xunit.v3.core" Version="3.2.2" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="ZeroFormatter" Version="1.6.4" />
     <PackageVersion Include="ZooKeeperNetEx" Version="3.4.12.4" />
   </ItemGroup>
@@ -173,17 +171,4 @@
     <PackageVersion Update="System.Memory.Data" Version="10.0.3" />
     <PackageVersion Update="System.Text.Json" Version="10.0.5" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' and (
-      '$(MSBuildProjectName)' == 'Orleans.Persistence.TestKit' or
-      '$(MSBuildProjectName)' == 'Orleans.Persistence.TestKit.Tests' or
-      '$(MSBuildProjectName)' == 'Orleans.AWS.Tests' or
-      '$(MSBuildProjectName)' == 'Orleans.AdoNet.Tests' or
-      '$(MSBuildProjectName)' == 'Orleans.Azure.Tests' or
-      '$(MSBuildProjectName)' == 'Orleans.Cosmos.Tests' or
-      '$(MSBuildProjectName)' == 'Orleans.Persistence.Firestore.Tests' or
-      '$(MSBuildProjectName)' == 'Orleans.Redis.Tests') ">
-    <PackageVersion Update="System.Collections.Immutable" Version="10.0.0" />
-    <PackageVersion Update="System.IO.Pipelines" Version="10.0.5" />
-    <PackageVersion Update="System.Text.Json" Version="10.0.5" />
-  </ItemGroup>
 </Project>

docs/site/src/content/docs/grains/snippets/testing/orleans-testing/Sample.OrleansTesting/ClusterFixture.cs

@@ -5,13 +5,13 @@ public sealed class ClusterFixture : IAsyncLifetime
 {
     public InProcessTestCluster Cluster { get; private set; } = null!;
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         var builder = new InProcessTestClusterBuilder();
         Cluster = builder.Build();
         await Cluster.DeployAsync();
     }
 
-    public async Task DisposeAsync() => await Cluster.DisposeAsync();
+    public async ValueTask DisposeAsync() => await Cluster.DisposeAsync();
 }
 // </cluster_fixture>

docs/site/src/content/docs/grains/snippets/testing/orleans-testing/Sample.OrleansTesting/HelloGrainTests.cs

@@ -7,7 +7,7 @@ public sealed class HelloGrainTests : IAsyncLifetime
 {
     private InProcessTestCluster _cluster = null!;
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         var builder = new InProcessTestClusterBuilder();
         _cluster = builder.Build();
@@ -23,6 +23,6 @@ public async Task SaysHelloCorrectly()
         Assert.Equal("Hello, World!", greeting);
     }
 
-    public async Task DisposeAsync() => await _cluster.DisposeAsync();
+    public async ValueTask DisposeAsync() => await _cluster.DisposeAsync();
 }
 // </basic_cluster_test>

docs/site/src/content/docs/grains/snippets/testing/orleans-testing/Sample.OrleansTesting/MSTestClusterFixture.cs

@@ -11,7 +11,7 @@ public sealed class MSTestClusterFixture
     public static InProcessTestCluster Cluster { get; private set; } = null!;
 
     [AssemblyInitialize]
-    public static async Task Initialize(TestContext _)
+    public static async Task Initialize(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _)
     {
         var builder = new InProcessTestClusterBuilder();
         Cluster = builder.Build();

docs/site/src/content/docs/grains/snippets/testing/orleans-testing/Sample.OrleansTesting/Sample.OrleansTesting.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
@@ -15,8 +16,8 @@
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework" Version="4.3.3" />
     <PackageReference Include="OrleansTestKit" Version="10.0.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

docs/site/src/content/docs/grains/snippets/testing/orleans-testing/Sample.OrleansTesting/TopologyTests.cs

@@ -7,7 +7,7 @@ public sealed class TopologyTests : IAsyncLifetime
 {
     private InProcessTestCluster _cluster = null!;
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         _cluster = ClusterConfiguration.Create(new SharedTestState());
         await _cluster.DeployAsync();
@@ -24,6 +24,6 @@ public async Task GrainCallSucceedsAfterSiloJoinsAndLeaves()
         Assert.Equal("Hello, World!", greeting);
     }
 
-    public async Task DisposeAsync() => await _cluster.DisposeAsync();
+    public async ValueTask DisposeAsync() => await _cluster.DisposeAsync();
 }
 // </topology_change_test>

docs/tools/PackageJsonGenerator.Tests/PackageJsonGenerator.Tests.csproj

@@ -2,14 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Orleans.Persistence.TestKit/GrainStorageTestFixture.cs

@@ -89,7 +89,7 @@ protected virtual void ConfigureTestCluster(InProcessTestClusterBuilder builder)
     /// Initializes the test cluster and resolves the configured storage provider.
     /// </summary>
     /// <returns>A task which represents the asynchronous initialization operation.</returns>
-    public virtual async Task InitializeAsync()
+    public virtual async ValueTask InitializeAsync()
     {
         try
         {
@@ -117,7 +117,7 @@ public virtual async Task InitializeAsync()
     /// Stops and disposes the test cluster.
     /// </summary>
     /// <returns>A task which represents the asynchronous disposal operation.</returns>
-    public virtual async Task DisposeAsync()
+    public virtual async ValueTask DisposeAsync()
     {
         if (_cluster is not { } cluster)
         {

src/Orleans.Persistence.TestKit/Orleans.Persistence.TestKit.csproj

@@ -19,6 +19,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Accordant" />
+    <PackageReference Include="System.Collections.Immutable" VersionOverride="10.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.IO.Pipelines" VersionOverride="10.0.5" PrivateAssets="all" />
+    <PackageReference Include="System.Text.Json" VersionOverride="10.0.5" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

src/Orleans.Serialization.TestKit/CopierTester.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Xunit;
-using Xunit.Abstractions;
 using System.Linq;
 
 namespace Orleans.Serialization.TestKit

src/Orleans.Serialization.TestKit/FieldCodecTester.cs

@@ -13,7 +13,6 @@
 using System.Text;
 using Xunit;
 using Orleans.Serialization.Serializers;
-using Xunit.Abstractions;
 using Orleans.Serialization.GeneratedCodeHelpers;
 
 namespace Orleans.Serialization.TestKit

src/Orleans.Serialization.TestKit/Orleans.Serialization.TestKit.csproj

@@ -12,16 +12,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="System.IO.Pipelines" />
-    <PackageReference Include="xunit.assert" />
-    <PackageReference Include="xunit.core" />
-    <PackageReference Include="xunit.extensibility.core" />
+    <PackageReference Include="xunit.v3.assert" />
+    <PackageReference Include="xunit.v3.extensibility.core" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Update="xunit.assert" VersionOverride="2.4.2" />
-    <PackageReference Update="xunit.core" VersionOverride="2.4.2" />
-    <PackageReference Update="xunit.extensibility.core" VersionOverride="2.4.2" />
-    <PackageReference Update="xunit.extensibility.execution" VersionOverride="2.4.2" />
+  <ItemGroup>
+    <Using Include="Xunit" />
   </ItemGroup>
 
   <ItemGroup>

src/Orleans.Serialization.TestKit/SerializationTester.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Orleans.Serialization.TestKit
 {

src/Orleans.Serialization.TestKit/ValueTypeFieldCodecTester.cs

@@ -4,7 +4,6 @@
 using System.IO.Pipelines;
 using Xunit;
 using Orleans.Serialization.Serializers;
-using Xunit.Abstractions;
 
 namespace Orleans.Serialization.TestKit
 {

src/Orleans.Transactions.TestKit.xUnit/ConsistencyTransactionTestRunner.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Orleans.Transactions.TestKit.Consistency;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Orleans.Transactions.TestKit.xUnit
 {
@@ -15,7 +14,7 @@ public ConsistencyTransactionTestRunnerxUnit(IGrainFactory grainFactory, ITestOu
         protected override bool StorageAdaptorHasLimitedCommitSpace => true;
         protected override bool StorageErrorInjectionActive => true;
 
-        [SkippableTheory]
+        [Theory]
         // high congestion
         [InlineData(2, 2, true, true, ReadWriteDetermination.PerGrain)]
         [InlineData(2, 3, true, true, ReadWriteDetermination.PerGrain)]

src/Orleans.Transactions.TestKit.xUnit/ControlledFaultInjectionTransactionTestRunner.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Orleans.Transactions.TestKit.xUnit
 {
@@ -10,19 +9,19 @@ public ControlledFaultInjectionTransactionTestRunnerxUnit(IGrainFactory grainFac
          : base(grainFactory, output.WriteLine)
         { }
 
-        [SkippableFact]
+        [Fact]
         public override Task SingleGrainReadTransaction()
         {
             return base.SingleGrainReadTransaction();
         }
 
-        [SkippableFact]
+        [Fact]
         public override Task SingleGrainWriteTransaction()
         {
             return base.SingleGrainWriteTransaction();
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionFaultInjectPhase.AfterPrepare, FaultInjectionType.Deactivation)]
         [InlineData(TransactionFaultInjectPhase.AfterConfirm, FaultInjectionType.Deactivation)]
         [InlineData(TransactionFaultInjectPhase.AfterPrepared, FaultInjectionType.Deactivation)]

src/Orleans.Transactions.TestKit.xUnit/DisabledTransactionsTestRunner.cs

@@ -1,5 +1,4 @@
-using Xunit;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Orleans.Transactions.TestKit.xUnit
 {
@@ -8,14 +7,14 @@ public class DisabledTransactionsTestRunnerxUnit : DisabledTransactionsTestRunne
         protected DisabledTransactionsTestRunnerxUnit(IGrainFactory grainFactory, ITestOutputHelper output)
         : base(grainFactory, output.WriteLine) { }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.NoStateTransactionalGrain)]
         public override void TransactionGrainsThrowWhenTransactions(string transactionTestGrainClassName)
         {
              base.TransactionGrainsThrowWhenTransactions(transactionTestGrainClassName);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.NoStateTransactionalGrain)]
         public override void MultiTransactionGrainsThrowWhenTransactions(string transactionTestGrainClassName)
         {

src/Orleans.Transactions.TestKit.xUnit/ExclusiveLockTransactionTestRunner.cs

@@ -1,5 +1,4 @@
-using Xunit;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Orleans.Transactions.TestKit.xUnit
 {
@@ -10,14 +9,14 @@ protected ExclusiveLockTransactionTestRunnerxUnit(IGrainFactory grainFactory, IT
         {
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain)]
         public override Task ConcurrentReadThenWriteWithoutExclusiveLock_ThrowsLockException(string grainStates)
         {
             return base.ConcurrentReadThenWriteWithoutExclusiveLock_ThrowsLockException(grainStates);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain)]
         public override Task ConcurrentReadThenWriteWithExclusiveLock_NoLockException(string grainStates)
         {

src/Orleans.Transactions.TestKit.xUnit/GoldenPathTransactionTestRunner.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Orleans.Transactions.TestKit.xUnit
 {
@@ -9,7 +8,7 @@ public abstract class GoldenPathTransactionTestRunnerxUnit : GoldenPathTransacti
         protected GoldenPathTransactionTestRunnerxUnit(IGrainFactory grainFactory, ITestOutputHelper output)
         : base(grainFactory, output.WriteLine) { }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain)]
@@ -18,7 +17,7 @@ public override Task SingleGrainReadTransaction(string grainStates)
             return base.SingleGrainReadTransaction(grainStates);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain)]
@@ -27,7 +26,7 @@ public override Task SingleGrainWriteTransaction(string grainStates)
             return base.SingleGrainWriteTransaction(grainStates);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions / 2)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain, 1)]
@@ -36,7 +35,7 @@ public override Task MultiGrainWriteTransaction(string grainStates, int grainCou
             return base.MultiGrainWriteTransaction(grainStates, grainCount);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions / 2)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain, 1)]
@@ -45,7 +44,7 @@ public override Task MultiGrainReadWriteTransaction(string grainStates, int grai
             return base.MultiGrainReadWriteTransaction(grainStates, grainCount);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions / 2)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain, 1)]
@@ -54,7 +53,7 @@ public override Task RepeatGrainReadWriteTransaction(string grainStates, int gra
             return base.RepeatGrainReadWriteTransaction(grainStates, grainCount);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain)]
@@ -63,7 +62,7 @@ public override Task MultiWriteToSingleGrainTransaction(string grainStates)
             return base.MultiWriteToSingleGrainTransaction(grainStates);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions / 2)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain, 1)]
@@ -72,7 +71,7 @@ public override Task RWRWTest(string grainStates, int grainCount)
             return base.RWRWTest(grainStates, grainCount);
         }
 
-        [SkippableTheory]
+        [Theory]
         [InlineData(TransactionTestConstants.SingleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions)]
         [InlineData(TransactionTestConstants.DoubleStateTransactionalGrain, TransactionTestConstants.MaxCoordinatedTransactions / 2)]
         [InlineData(TransactionTestConstants.MaxStateTransactionalGrain, 1)]