Update all tests to xunit v3 and fix nullable issues

Directory.Build.props

@@ -23,6 +23,7 @@
         <LangVersion>14</LangVersion>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup>

src/Events/Events/src/ClickView.Extensions.Events.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(FullTargetFrameworks)</TargetFrameworks>
     <PackageTags>events</PackageTags>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/Events/Events/test/ClickView.Extensions.Events.Tests.csproj

@@ -3,13 +3,14 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Events/Events/test/EventsIntegrationTests.cs

@@ -26,7 +26,7 @@ public async Task CanPublishUsingInMemoryBus()
         await eventPublisher.PublishAsync(evt);
 
         //Wait for events to propagate/tasks to finish
-        await Task.Delay(100);
+        await Task.Delay(100, TestContext.Current.CancellationToken);
 
         //assert
         Assert.Single(eventHandler.Events);
@@ -55,4 +55,4 @@ public Task HandleEventAsync(CustomEvent evt)
             return Task.FromResult(0);
         }
     }
-}
+}

src/Hosting/Hosting/src/ClickView.Extensions.Hosting.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(FullTargetFrameworks)</TargetFrameworks>
-    <Nullable>enable</Nullable>
     <PackageTags>hosting</PackageTags>
   </PropertyGroup>
 

src/Hosting/Hosting/test/ClickView.Extensions.Hosting.Tests/ClickView.Extensions.Hosting.Tests.csproj

@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <OutputType>Exe</OutputType>
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
@@ -12,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Hosting/Hosting/test/ClickView.Extensions.Hosting.Tests/CronWorkerTests.cs

@@ -18,7 +18,7 @@ public async Task RunAsync_RunEveryTwoSeconds()
 
         await scheduler.StartAsync(CancellationToken.None);
 
-        await Task.Delay(TimeSpan.FromSeconds(5));
+        await Task.Delay(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
         await scheduler.StopAsync(CancellationToken.None);
 
@@ -30,7 +30,7 @@ public void CronWorkerOption_MinGreaterThanMax_ThrowException()
     {
         const string everyTwoSecondCron = "*/2 * * * * *";
 
-        Assert.Throws<InvalidCronWorkerOptionException>(() => 
+        Assert.Throws<InvalidCronWorkerOptionException>(() =>
             { new CronWorkerOption(everyTwoSecondCron, true, TimeSpan.FromSeconds(2), TimeSpan.FromSeconds(1)); });
     }
 
@@ -48,7 +48,7 @@ public async Task RunAsync_RunEveryTwoSecondsWithJitter_Executes()
         var currentTime = DateTime.UtcNow;
 
         // Give it a bit more time to ensure the task is executed
-        await Task.Delay(TimeSpan.FromSeconds(4));
+        await Task.Delay(TimeSpan.FromSeconds(4), TestContext.Current.CancellationToken);
 
         await scheduler.StopAsync(CancellationToken.None);
 
@@ -70,4 +70,4 @@ protected override Task RunAsync(CancellationToken cancellationToken)
             return Task.CompletedTask;
         }
     }
-}
+}

src/Primitives/Primitives/src/ClickView.Extensions.Primitives.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(FullTargetFrameworks)</TargetFrameworks>
     <PackageTags>primitives</PackageTags>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
 </Project>

src/Primitives/Primitives/test/ClickView.Extensions.Primitives.Tests.csproj

@@ -3,12 +3,12 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/RestClient/Authenticators/OAuth/src/ClickView.Extensions.RestClient.Authenticators.OAuth.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>$(FullTargetFrameworks)</TargetFrameworks>
     <PackageTags>restclient rest http oauth</PackageTags>
     <Description>OAuth authenticators for ClickView.Extensions.RestClient</Description>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/RestClient/Authenticators/OAuth/test/ClickView.Extensions.RestClient.Authenticators.OAuth.Tests.csproj

@@ -3,12 +3,14 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <Nullable>disable</Nullable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/RestClient/Authenticators/OAuth/test/DiscoveryEndpointFactoryTests.cs

@@ -39,7 +39,7 @@ public async Task GetTokenClientAsync_Expired_Refreshes()
 
         var endpoints = await factory.GetAsync();
 
-        await Task.Delay(1500);
+        await Task.Delay(1500, TestContext.Current.CancellationToken);
 
         var endpoints2 = await factory.GetAsync();
 
@@ -76,4 +76,4 @@ public async Task GetTokenClientAsync_ThreadSafe_SameInstance()
 
         Assert.Equal(await endpoints1Task, await endpoints2Task);
     }
-}
+}

src/RestClient/Authenticators/OAuth/test/TokenSource/TokenStoreTokenSourceTests.cs

@@ -17,8 +17,8 @@ public async Task GetTokensAsync_TokenStoreReturnsNull_DoesNotReturnListWithNull
 
         var source = new TokenStoreTokenSource(tokenStore.Object);
 
-        var tokens = await source.GetTokensAsync();
+        var tokens = await source.GetTokensAsync(TestContext.Current.CancellationToken);
 
         Assert.Empty(tokens);
     }
-}
+}

src/RestClient/RestClient/src/ClickView.Extensions.RestClient.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(FullTargetFrameworks)</TargetFrameworks>
     <PackageTags>restclient rest http</PackageTags>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +17,7 @@
     <Reference Include="System.Threading.Tasks" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'"> 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
   </ItemGroup>
 

src/RestClient/RestClient/test/ClickView.Extensions.RestClient.Tests.csproj

@@ -3,13 +3,13 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/RestClient/RestClient/test/RestClientRequestTests.cs

@@ -27,7 +27,9 @@ public async Task GetContent_StreamBody_ReturnsStreamContent()
         var result = request.GetContent();
 
         var streamContent = Assert.IsType<StreamContent>(result);
+#pragma warning disable xUnit1051
         var bytes = await streamContent.ReadAsByteArrayAsync();
+#pragma warning restore xUnit1051
         Assert.Equal(streamContent.Headers.ContentType, MediaTypeHeaderValue.Parse("application/octet-stream"));
         Assert.Equal([1, 2, 3], bytes);
     }
@@ -41,7 +43,9 @@ public async Task GetContent_StreamBodyContentType_ReturnsStreamContent()
         var result = request.GetContent();
 
         var streamContent = Assert.IsType<StreamContent>(result);
+#pragma warning disable xUnit1051
         var bytes = await streamContent.ReadAsByteArrayAsync();
+#pragma warning restore xUnit1051
         Assert.Equal(streamContent.Headers.ContentType, MediaTypeHeaderValue.Parse("application/test"));
         Assert.Equal([1, 2, 3], bytes);
     }
@@ -58,7 +62,9 @@ public async Task GetContent_ObjectBody_ReturnsStringContent()
         var result = request.GetContent();
 
         var streamContent = Assert.IsType<StringContent>(result);
+#pragma warning disable xUnit1051
         var resultString = await streamContent.ReadAsStringAsync();
+#pragma warning restore xUnit1051
 
         Assert.Equal("hello world", resultString);
         Assert.Equal("application/test", streamContent.Headers.ContentType?.MediaType);

src/RestClient/RestClient/test/RestClientTests.cs

@@ -40,7 +40,7 @@ public async Task ExecuteAsync_UsesBaseAddress()
         var client = new RestClient(new Uri("http://clickview.com.au"), new HttpClient(mockMessageHandler.Object));
 
         // act
-        await client.ExecuteAsync(request);
+        await client.ExecuteAsync(request, TestContext.Current.CancellationToken);
 
         // assert
         mockMessageHandler.Verify();
@@ -74,7 +74,7 @@ public async Task ExecuteAsync_UsesBaseAddressOverHttpClientBaseAddress()
         });
 
         // act
-        await client.ExecuteAsync(request);
+        await client.ExecuteAsync(request, TestContext.Current.CancellationToken);
 
         // assert
         mockMessageHandler.Verify();
@@ -108,7 +108,7 @@ public async Task ExecuteAsync_UsesHttpClientBaseAddress()
         });
 
         // act
-        await client.ExecuteAsync(request);
+        await client.ExecuteAsync(request, TestContext.Current.CancellationToken);
 
         // assert
         mockMessageHandler.Verify();
@@ -142,7 +142,7 @@ public async Task ExecuteAsync_AbsoluteUriRequest()
         });
 
         // act
-        await client.ExecuteAsync(request);
+        await client.ExecuteAsync(request, TestContext.Current.CancellationToken);
 
         // assert
         mockMessageHandler.Verify();
@@ -159,7 +159,7 @@ public async Task ExecuteAsync_NoBaseAddress_ThrowsInvalidOperationException()
         var client = new RestClient(new HttpClient(mockMessageHandler.Object));
 
         // act/assert
-        await Assert.ThrowsAsync<InvalidOperationException>(() => client.ExecuteAsync(request));
+        await Assert.ThrowsAsync<InvalidOperationException>(() => client.ExecuteAsync(request, TestContext.Current.CancellationToken));
     }
 
     [Fact]
@@ -186,7 +186,7 @@ public async Task ExecuteAsync_AddBodyStream_MessageContentStreamContent()
 
         request.AddBody(new MemoryStream());
 
-        var response = await client.ExecuteAsync(request);
+        var response = await client.ExecuteAsync(request, TestContext.Current.CancellationToken);
 
         mockMessageHandler.Verify();
         Assert.Equal("test: success", response.Data);
@@ -231,7 +231,7 @@ public async Task ExecuteAsync_DefaultUserAgentSet_RequestContainsDefaultUserAge
             DefaultUserAgent = "testapp/1.0.0 (rv:1; test; example/1.2.3)"
         });
 
-        await client.ExecuteAsync(request);
+        await client.ExecuteAsync(request, TestContext.Current.CancellationToken);
 
         mockMessageHandler.Verify();
         Assert.Equal("testapp/1.0.0 (rv:1; test; example/1.2.3)", userAgentHeader);
@@ -244,4 +244,4 @@ protected override async ValueTask<RestClientResponse<string>> ParseResponseAsyn
             return new RestClientResponse<string>(message, await message.Content.ReadAsStringAsync());
         }
     }
-}
+}

src/RestClient/examples/ExampleClient/ErrorResponse.cs

@@ -2,5 +2,5 @@
 
 public class ErrorResponse
 {
-    public string Message { get; set; }
-}
+    public string? Message { get; set; }
+}

src/RestClient/examples/ExampleClient/ExampleApiClient.cs

@@ -24,21 +24,21 @@ public ExampleApiClient(Uri baseAddress, string authKey)
     /// </summary>
     /// <param name="username"></param>
     /// <returns></returns>
-    public async Task<UserModel> GetUserCustomRequestAsync(string username)
+    public async Task<UserModel?> GetUserCustomRequestAsync(string username)
     {
-        var response = await _client.ExecuteAsync(new ExampleUserRequest(username)).ConfigureAwait(false);
+        var response = await _client.ExecuteAsync(new ExampleUserRequest(username));
 
         return response.Data;
     }
 
-    public async Task<UserModel> GetUserAsync(string username)
+    public async Task<UserModel?> GetUserAsync(string username)
     {
         var request = new RestClientRequest<UserModel>(HttpMethod.Get, "v1/users");
 
         request.AddQueryParameter("username", username);
 
-        var response = await _client.ExecuteAsync(request).ConfigureAwait(false);
+        var response = await _client.ExecuteAsync(request);
 
         return response.Data;
     }
-}
+}

src/RestClient/examples/ExampleClient/ExampleUserRequest.cs

@@ -1,5 +1,6 @@
 namespace ExampleClient;
 
+using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Net.Http;
 using ClickView.Extensions.RestClient;
@@ -26,7 +27,7 @@ protected override void HandleError(Error error)
         base.HandleError(error);
     }
 
-    protected override bool TryParseErrorBody(string content, out ErrorBody error)
+    protected override bool TryParseErrorBody(string content, [NotNullWhen(true)] out ErrorBody? error)
     {
         var errorResponse = Deserialize<ErrorResponse>(content);
 
@@ -43,4 +44,4 @@ protected override bool TryParseErrorBody(string content, out ErrorBody error)
 
         return true;
     }
-}
+}

src/RestClient/examples/ExampleClient/UserModel.cs

@@ -2,5 +2,5 @@
 
 public class UserModel
 {
-    public string Username { get; set; }
-}
+    public string? Username { get; set; }
+}

src/Utilities/Utilities/src/ClickView.Extensions.Utilities.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(FullTargetFrameworks)</TargetFrameworks>
     <PackageTags>utilities</PackageTags>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>