Updated xunit (2.4.1 -> 2.9.0) (#7275)

ChilliCream · Jul 19, 2024 · 76c4f25 · 76c4f25
1 parent e302aa4
commit 76c4f25
Show file tree

Hide file tree

Showing 98 changed files with 518 additions and 533 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -61,8 +61,8 @@
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.0" />
     <PackageVersion Include="Unquote" Version="6.1.0" />
-    <PackageVersion Include="Xunit" Version="2.4.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageVersion Include="Xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

diff --git a/src/GreenDonut/test/Core.Tests/DataLoaderExtensionsTests.cs b/src/GreenDonut/test/Core.Tests/DataLoaderExtensionsTests.cs
@@ -77,7 +77,7 @@ public async Task SetNewCacheEntry()
         loader.Set(key, value);
 
         // assert
-        var loadResult = await loader.LoadAsync(key).ConfigureAwait(false);
+        var loadResult = await loader.LoadAsync(key);
 
         Assert.Equal(value, loadResult);
     }
@@ -107,7 +107,7 @@ public async Task SetTwice()
         loader.Set(key, second);
 
         // assert
-        var loadResult = await loader.LoadAsync(key).ConfigureAwait(false);
+        var loadResult = await loader.LoadAsync(key);
 
         Assert.Equal(first, loadResult);
     }

diff --git a/src/GreenDonut/test/Core.Tests/TaskCacheTests.cs b/src/GreenDonut/test/Core.Tests/TaskCacheTests.cs
@@ -216,7 +216,7 @@ public void TryAddTwice()
     }
 
     [Fact(DisplayName = "GetOrAddTask: Should return new item if nothing is cached")]
-    public void GetOrAddTaskWhenNothingIsCached()
+    public async Task GetOrAddTaskWhenNothingIsCached()
     {
         // arrange
         var cacheSize = 10;
@@ -227,11 +227,11 @@ public void GetOrAddTaskWhenNothingIsCached()
         var resolved = cache.GetOrAddTask(key, _ => new Promise<string>(Task.FromResult("Quox")));
 
         // assert
-        Assert.Equal("Quox", resolved.Result);
+        Assert.Equal("Quox", await resolved);
     }
 
     [Fact(DisplayName = "TryGetValue (String): Should return one result")]
-    public void GetOrAddTaskWhenNothingIsCached_IntegerKey()
+    public async Task GetOrAddTaskWhenNothingIsCached_IntegerKey()
     {
         // arrange
         var cacheSize = 10;
@@ -242,6 +242,6 @@ public void GetOrAddTaskWhenNothingIsCached_IntegerKey()
         var resolved = cache.GetOrAddTask(key, _ => new Promise<string>(Task.FromResult("Quox")));
 
         // assert
-        Assert.Equal("Quox", resolved.Result);
+        Assert.Equal("Quox", await resolved);
     }
 }
diff --git a/...Chocolate/ApolloFederation/test/ApolloFederation.Tests/ReferenceResolverAttributeTests.cs b/...Chocolate/ApolloFederation/test/ApolloFederation.Tests/ReferenceResolverAttributeTests.cs
@@ -16,7 +16,7 @@ namespace HotChocolate.ApolloFederation;
 public class ReferenceResolverAttributeTests
 {
     [Fact(Skip = "Needs to be fixed!")]
-    public async void InClassRefResolver_PureCodeFirst()
+    public async Task InClassRefResolver_PureCodeFirst()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -36,7 +36,7 @@ public async void InClassRefResolver_PureCodeFirst()
     }
 
     [Fact]
-    public async void ExternalRefResolver_PureCodeFirst()
+    public async Task ExternalRefResolver_PureCodeFirst()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -57,7 +57,7 @@ public async void ExternalRefResolver_PureCodeFirst()
     }
 
     [Fact]
-    public async void SingleKey_CompiledResolver()
+    public async Task SingleKey_CompiledResolver()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -76,7 +76,7 @@ public async void SingleKey_CompiledResolver()
     }
 
     [Fact]
-    public async void ExternalFields_Set()
+    public async Task ExternalFields_Set()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -98,7 +98,7 @@ public async void ExternalFields_Set()
     }
 
     [Fact]
-    public async void ExternalFields_Not_Set()
+    public async Task ExternalFields_Not_Set()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -118,7 +118,7 @@ public async void ExternalFields_Not_Set()
     }
 
     [Fact]
-    public async void MultiKey_CompiledResolver()
+    public async Task MultiKey_CompiledResolver()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -139,7 +139,7 @@ public async void MultiKey_CompiledResolver()
     }
 
     [Fact]
-    public async void ExternalRefResolver_RenamedMethod_PureCodeFirst()
+    public async Task ExternalRefResolver_RenamedMethod_PureCodeFirst()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -159,7 +159,7 @@ public async void ExternalRefResolver_RenamedMethod_PureCodeFirst()
     }
 
     [Fact]
-    public void InClassRefResolver_RenamedMethod_InvalidName_PureCodeFirst()
+    public async Task InClassRefResolver_RenamedMethod_InvalidName_PureCodeFirst()
     {
         // arrange
         async Task SchemaCreation()
@@ -173,11 +173,11 @@ async Task SchemaCreation()
 
         // act
         // assert
-        Assert.ThrowsAsync<SchemaException>(SchemaCreation);
+        await Assert.ThrowsAsync<SchemaException>(SchemaCreation);
     }
 
     [Fact]
-    public void ExternalRefResolver_RenamedMethod_InvalidName_PureCodeFirst()
+    public async Task ExternalRefResolver_RenamedMethod_InvalidName_PureCodeFirst()
     {
         // arrange
         async Task SchemaCreation()
@@ -191,7 +191,7 @@ async Task SchemaCreation()
 
         // act
         // assert
-        Assert.ThrowsAsync<SchemaException>(SchemaCreation);
+        await Assert.ThrowsAsync<SchemaException>(SchemaCreation);
     }
 
     [Fact]

diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Authorization.Tests/AuthorizeDirectiveTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Authorization.Tests/AuthorizeDirectiveTests.cs
@@ -36,7 +36,7 @@ public void CreateInstance_PolicyRoles_PolicyIsSetRolesIsEmpty()
 
         // assert
         Assert.Equal("abc", authorizeDirective.Policy);
-        Assert.Empty(authorizeDirective.Roles);
+        Assert.Empty(authorizeDirective.Roles!);
     }
 
     [Fact]
@@ -76,7 +76,7 @@ public void CreateInstance_Roles_RolesHasItems()
         // assert
         Assert.Null(authorizeDirective.Policy);
         Assert.Collection(
-            authorizeDirective.Roles,
+            authorizeDirective.Roles!,
             t => Assert.Equal("a", t),
             t => Assert.Equal("b", t));
     }

diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/DefaultValueTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/DefaultValueTests.cs
@@ -32,7 +32,7 @@ public MyInputObjectOut DoSomething(MyInputObject input) =>
 
 
     [Fact]
-    public void DefaultValueTests_Simple()
+    public async Task DefaultValueTests_Simple()
     {
         // Arrange
         var services = new ServiceCollection();
@@ -43,10 +43,10 @@ public void DefaultValueTests_Simple()
 
         var serviceProvider = services.BuildServiceProvider();
         var executorResolver = serviceProvider.GetRequiredService<IRequestExecutorResolver>();
-        var executor = executorResolver.GetRequestExecutorAsync().Result;
+        var executor = await executorResolver.GetRequestExecutorAsync();
 
         // Act
-        var result = executor.ExecuteAsync("mutation{ doSomething(input: { }) { result } }").Result;
+        var result = await executor.ExecuteAsync("mutation{ doSomething(input: { }) { result } }");
 
         // Extract the data from the result
         var jsonResult = result.ToJson();

diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/GraphQLOverHttpSpecTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/GraphQLOverHttpSpecTests.cs
@@ -536,7 +536,7 @@ public async Task OperationBatch()
         using var response = await client.SendAsync(request);
 
         // assert
-        Assert.Equal(response.StatusCode, OK);
+        Assert.Equal(OK, response.StatusCode);
 
         var sortedResults = new SortedList<(int?, int?), OperationResult>();
 
@@ -581,7 +581,7 @@ public async Task VariableBatch()
         using var response = await client.SendAsync(request);
 
         // assert
-        Assert.Equal(response.StatusCode, OK);
+        Assert.Equal(OK, response.StatusCode);
 
         await foreach (var result in response.ReadAsResultStreamAsync())
         {
@@ -606,7 +606,7 @@ public async Task After_Execution_StatusCode_Is_200()
         using var response = await client.SendAsync(request);
 
         // assert
-        Assert.Equal(response.StatusCode, OK);
+        Assert.Equal(OK, response.StatusCode);
     }
 
     private HttpClient GetClient(HttpTransportVersion serverTransportVersion)

diff --git a/.../test/Transport.Sockets.Client.Tests/GraphQLOverWebSocket/WebSocketClientProtocolTests.cs b/.../test/Transport.Sockets.Client.Tests/GraphQLOverWebSocket/WebSocketClientProtocolTests.cs
@@ -114,7 +114,7 @@ public Task Subscribe_Disconnect()
             // ... try iterate
             await foreach (var unused in socketResult.ReadResultsAsync().WithCancellation(ct))
             {
-                Assert.True(false, "Stream should have been aborted");
+                Assert.Fail("Stream should have been aborted");
             }
         });
     }

diff --git a/...ns/test/HotChocolate.AzureFunctions.IsolatedProcess.Tests/IsolatedProcessEndToEndTests.cs b/...ns/test/HotChocolate.AzureFunctions.IsolatedProcess.Tests/IsolatedProcessEndToEndTests.cs
@@ -37,10 +37,10 @@ public async Task AzFuncIsolatedProcess_EndToEndTestAsync()
         // Execute Query Test for end-to-end validation...
         // NOTE: This uses the new Az Func Isolated Process extension to execute
         // via HttpRequestData...
-        var response = await requestExecutor.ExecuteAsync(request).ConfigureAwait(false);
+        var response = await requestExecutor.ExecuteAsync(request);
 
         // Read, Parse & Validate the response...
-        var resultContent = await ReadResponseAsStringAsync(response).ConfigureAwait(false);
+        var resultContent = await ReadResponseAsStringAsync(response);
         Assert.False(string.IsNullOrWhiteSpace(resultContent));
 
         dynamic json = JObject.Parse(resultContent!);
@@ -87,10 +87,10 @@ public async Task AzFuncIsolatedProcess_FunctionsContextItemsTestAsync()
         // Execute Query Test for end-to-end validation...
         // NOTE: This uses the new Az Func Isolated Process extension to execute
         // via HttpRequestData...
-        var response = await requestExecutor.ExecuteAsync(request).ConfigureAwait(false);
+        var response = await requestExecutor.ExecuteAsync(request);
 
         // Read, Parse & Validate the response...
-        var resultContent = await ReadResponseAsStringAsync(response).ConfigureAwait(false);
+        var resultContent = await ReadResponseAsStringAsync(response);
         Assert.False(string.IsNullOrWhiteSpace(resultContent));
 
         dynamic json = JObject.Parse(resultContent!);
@@ -116,10 +116,10 @@ public async Task AzFuncIsolatedProcess_BananaCakePopTestAsync()
         // Execute Query Test for end-to-end validation...
         // NOTE: This uses the new Az Func Isolated Process extension to execute
         // via HttpRequestData...
-        var httpResponseData = await requestExecutor.ExecuteAsync(httpRequestData).ConfigureAwait(false);
+        var httpResponseData = await requestExecutor.ExecuteAsync(httpRequestData);
 
         // Read, Parse & Validate the response...
-        var resultContent = await ReadResponseAsStringAsync(httpResponseData).ConfigureAwait(false);
+        var resultContent = await ReadResponseAsStringAsync(httpResponseData);
         Assert.NotNull(resultContent);
         Assert.False(string.IsNullOrWhiteSpace(resultContent));
         Assert.True(resultContent!.Contains("<html") && resultContent.Contains("</html>"));

diff --git a/src/HotChocolate/Caching/test/Caching.Tests/CacheControlTypeInterceptorTests.cs b/src/HotChocolate/Caching/test/Caching.Tests/CacheControlTypeInterceptorTests.cs
@@ -292,7 +292,7 @@ private static void ExpectErrors(Action<SchemaBuilder> configureBuilder)
 
             builder.Create();
 
-            Assert.False(true, "Expected error!");
+            Assert.Fail("Expected error!");
         }
         catch (SchemaException ex)
         {

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Errors/ErrorBehaviorTests.cs b/src/HotChocolate/Core/test/Execution.Tests/Errors/ErrorBehaviorTests.cs
@@ -106,7 +106,7 @@ public async Task Error_Filter_Adds_Details()
     }
 
     [Fact]
-    public async void Resolver_InvalidParentCast()
+    public async Task Resolver_InvalidParentCast()
     {
         // arrange
         using var snapshot = StartResultSnapshot();
@@ -129,7 +129,7 @@ public async void Resolver_InvalidParentCast()
     }
 
     [Fact]
-    public async void PureResolver_InvalidParentCast()
+    public async Task PureResolver_InvalidParentCast()
     {
         // arrange
         using var snapshot = StartResultSnapshot();
@@ -152,7 +152,7 @@ public async void PureResolver_InvalidParentCast()
     }
 
     [Fact]
-    public async void SetMaxAllowedValidationErrors_To_1()
+    public async Task SetMaxAllowedValidationErrors_To_1()
     {
         // arrange
         using var snapshot = StartResultSnapshot();

diff --git a/src/HotChocolate/Core/test/Execution.Tests/SourceObjectConversionTests.cs b/src/HotChocolate/Core/test/Execution.Tests/SourceObjectConversionTests.cs
@@ -12,7 +12,7 @@ public async Task ConvertSourceObject()
         // arrange
         var conversionTriggered = false;
 
-        var executor = new ServiceCollection()
+        var executor = await new ServiceCollection()
             .AddGraphQL()
             .AddQueryType<QueryType>()
             .AddTypeConverter<Foo, Baz>(input =>
@@ -23,8 +23,7 @@ public async Task ConvertSourceObject()
             .Services
             .BuildServiceProvider()
             .GetRequiredService<IRequestExecutorResolver>()
-            .GetRequestExecutorAsync()
-            .Result;
+            .GetRequestExecutorAsync();
 
         // act
         var result = await executor.ExecuteAsync("{ foo { qux } }");

diff --git a/src/HotChocolate/Core/test/Subscriptions.InMemory.Tests/InMemoryIntegrationTests.cs b/src/HotChocolate/Core/test/Subscriptions.InMemory.Tests/InMemoryIntegrationTests.cs
@@ -55,9 +55,8 @@ public virtual async Task Invalid_Message_Type()
         var sender = services.GetRequiredService<ITopicEventSender>();
 
         var result = await services.ExecuteRequestAsync(
-                "subscription { onMessage2(arg1: \"a\", arg2: \"b\") }",
-                cancellationToken: cts.Token)
-            .ConfigureAwait(false);
+            "subscription { onMessage2(arg1: \"a\", arg2: \"b\") }",
+            cancellationToken: cts.Token);
 
         // we need to execute the read for the subscription to start receiving.
         await using var responseStream = result.ExpectResponseStream();

diff --git a/src/HotChocolate/Core/test/Subscriptions.Postgres.Tests/AsyncAutoResetEventTests.cs b/src/HotChocolate/Core/test/Subscriptions.Postgres.Tests/AsyncAutoResetEventTests.cs
@@ -33,14 +33,14 @@ public void Set_Should_Throw_When_Disposed()
     }
 
     [Fact]
-    public void WaitAsync_Should_Throw_When_Disposed()
+    public async Task WaitAsync_Should_Throw_When_Disposed()
     {
         // Arrange
         var autoResetEvent = new AsyncAutoResetEvent();
         autoResetEvent.Dispose();
 
         // Act & Assert
-        Assert.ThrowsAsync<ObjectDisposedException>(()
+        await Assert.ThrowsAsync<ObjectDisposedException>(()
             => autoResetEvent.WaitAsync(CancellationToken.None));
     }