Annotated TestBuildingBlocks

Bart Koelman · Bart Koelman · commit 8a9911cc76f4 · 2021-10-28T17:15:08.000+02:00
diff --git a/test/TestBuildingBlocks/AssemblyInfo.cs b/test/TestBuildingBlocks/AssemblyInfo.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Diagnostics.CodeAnalysis;
 
 // https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/MSBuildIntegration.md#excluding-from-coverage
diff --git a/test/TestBuildingBlocks/DateTimeExtensions.cs b/test/TestBuildingBlocks/DateTimeExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace TestBuildingBlocks
diff --git a/test/TestBuildingBlocks/DbContextExtensions.cs b/test/TestBuildingBlocks/DbContextExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
diff --git a/test/TestBuildingBlocks/DummyTest.cs b/test/TestBuildingBlocks/DummyTest.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Xunit;
 
 namespace TestBuildingBlocks
diff --git a/test/TestBuildingBlocks/FakeLoggerFactory.cs b/test/TestBuildingBlocks/FakeLoggerFactory.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -64,7 +62,20 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
             public IDisposable BeginScope<TState>(TState state)
             {
-                return null;
+                return NullScope.Instance;
+            }
+
+            private sealed class NullScope : IDisposable
+            {
+                public static readonly NullScope Instance = new();
+
+                private NullScope()
+                {
+                }
+
+                public void Dispose()
+                {
+                }
             }
         }
 
diff --git a/test/TestBuildingBlocks/FakerContainer.cs b/test/TestBuildingBlocks/FakerContainer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -24,7 +22,7 @@ private static MethodBase GetTestMethod()
         {
             var stackTrace = new StackTrace();
 
-            MethodBase testMethod = stackTrace.GetFrames().Select(stackFrame => stackFrame.GetMethod()).FirstOrDefault(IsTestMethod);
+            MethodBase? testMethod = stackTrace.GetFrames().Select(stackFrame => stackFrame.GetMethod()).FirstOrDefault(IsTestMethod);
 
             if (testMethod == null)
             {
@@ -36,7 +34,7 @@ private static MethodBase GetTestMethod()
             return testMethod;
         }
 
-        private static bool IsTestMethod(MethodBase method)
+        private static bool IsTestMethod(MethodBase? method)
         {
             if (method == null)
             {
diff --git a/test/TestBuildingBlocks/FrozenSystemClock.cs b/test/TestBuildingBlocks/FrozenSystemClock.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.AspNetCore.Authentication;
 
diff --git a/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs b/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Net;
 using System.Net.Http;
 using FluentAssertions;
diff --git a/test/TestBuildingBlocks/IntegrationTest.cs b/test/TestBuildingBlocks/IntegrationTest.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -18,46 +16,46 @@ public abstract class IntegrationTest
         protected abstract JsonSerializerOptions SerializerOptions { get; }
 
         public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteHeadAsync<TResponseDocument>(string requestUrl,
-            Action<HttpRequestHeaders> setRequestHeaders = null)
+            Action<HttpRequestHeaders>? setRequestHeaders = null)
         {
             return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Head, requestUrl, null, null, setRequestHeaders);
         }
 
         public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteGetAsync<TResponseDocument>(string requestUrl,
-            Action<HttpRequestHeaders> setRequestHeaders = null)
+            Action<HttpRequestHeaders>? setRequestHeaders = null)
         {
             return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Get, requestUrl, null, null, setRequestHeaders);
         }
 
         public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePostAsync<TResponseDocument>(string requestUrl,
-            object requestBody, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders> setRequestHeaders = null)
+            object requestBody, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
         {
             return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Post, requestUrl, requestBody, contentType, setRequestHeaders);
         }
 
         public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePostAtomicAsync<TResponseDocument>(string requestUrl,
-            object requestBody, string contentType = HeaderConstants.AtomicOperationsMediaType, Action<HttpRequestHeaders> setRequestHeaders = null)
+            object requestBody, string contentType = HeaderConstants.AtomicOperationsMediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
         {
             return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Post, requestUrl, requestBody, contentType, setRequestHeaders);
         }
 
         public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecutePatchAsync<TResponseDocument>(string requestUrl,
-            object requestBody, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders> setRequestHeaders = null)
+            object requestBody, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
         {
             return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Patch, requestUrl, requestBody, contentType, setRequestHeaders);
         }
 
         public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteDeleteAsync<TResponseDocument>(string requestUrl,
-            object requestBody = null, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders> setRequestHeaders = null)
+            object? requestBody = null, string contentType = HeaderConstants.MediaType, Action<HttpRequestHeaders>? setRequestHeaders = null)
         {
             return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Delete, requestUrl, requestBody, contentType, setRequestHeaders);
         }
 
         private async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteRequestAsync<TResponseDocument>(HttpMethod method,
-            string requestUrl, object requestBody, string contentType, Action<HttpRequestHeaders> setRequestHeaders)
+            string requestUrl, object? requestBody, string? contentType, Action<HttpRequestHeaders>? setRequestHeaders)
         {
             using var request = new HttpRequestMessage(method, requestUrl);
-            string requestText = SerializeRequest(requestBody);
+            string? requestText = SerializeRequest(requestBody);
 
             if (!string.IsNullOrEmpty(requestText))
             {
@@ -79,18 +77,18 @@ public abstract class IntegrationTest
             string responseText = await responseMessage.Content.ReadAsStringAsync();
             var responseDocument = DeserializeResponse<TResponseDocument>(responseText);
 
-            return (responseMessage, responseDocument);
+            return (responseMessage, responseDocument!);
         }
 
-        private string SerializeRequest(object requestBody)
+        private string? SerializeRequest(object? requestBody)
         {
             return requestBody == null ? null :
                 requestBody is string stringRequestBody ? stringRequestBody : JsonSerializer.Serialize(requestBody, SerializerOptions);
         }
 
         protected abstract HttpClient CreateClient();
 
-        private TResponseDocument DeserializeResponse<TResponseDocument>(string responseText)
+        private TResponseDocument? DeserializeResponse<TResponseDocument>(string responseText)
         {
             if (typeof(TResponseDocument) == typeof(string))
             {
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Net.Http;
 using System.Text.Json;
@@ -35,9 +33,9 @@ public class IntegrationTestContext<TStartup, TDbContext> : IntegrationTest, IDi
     {
         private readonly Lazy<WebApplicationFactory<TStartup>> _lazyFactory;
         private readonly TestControllerProvider _testControllerProvider = new();
-        private Action<ILoggingBuilder> _loggingConfiguration;
-        private Action<IServiceCollection> _beforeServicesConfiguration;
-        private Action<IServiceCollection> _afterServicesConfiguration;
+        private Action<ILoggingBuilder>? _loggingConfiguration;
+        private Action<IServiceCollection>? _beforeServicesConfiguration;
+        private Action<IServiceCollection>? _afterServicesConfiguration;
 
         protected override JsonSerializerOptions SerializerOptions
         {
@@ -145,21 +143,21 @@ public async Task RunOnDatabaseAsync(Func<TDbContext, Task> asyncAction)
 
         private sealed class IntegrationTestWebApplicationFactory : WebApplicationFactory<TStartup>
         {
-            private Action<ILoggingBuilder> _loggingConfiguration;
-            private Action<IServiceCollection> _beforeServicesConfiguration;
-            private Action<IServiceCollection> _afterServicesConfiguration;
+            private Action<ILoggingBuilder>? _loggingConfiguration;
+            private Action<IServiceCollection>? _beforeServicesConfiguration;
+            private Action<IServiceCollection>? _afterServicesConfiguration;
 
-            public void ConfigureLogging(Action<ILoggingBuilder> loggingConfiguration)
+            public void ConfigureLogging(Action<ILoggingBuilder>? loggingConfiguration)
             {
                 _loggingConfiguration = loggingConfiguration;
             }
 
-            public void ConfigureServicesBeforeStartup(Action<IServiceCollection> servicesConfiguration)
+            public void ConfigureServicesBeforeStartup(Action<IServiceCollection>? servicesConfiguration)
             {
                 _beforeServicesConfiguration = servicesConfiguration;
             }
 
-            public void ConfigureServicesAfterStartup(Action<IServiceCollection> servicesConfiguration)
+            public void ConfigureServicesAfterStartup(Action<IServiceCollection>? servicesConfiguration)
             {
                 _afterServicesConfiguration = servicesConfiguration;
             }
diff --git a/test/TestBuildingBlocks/JsonApiStringConverter.cs b/test/TestBuildingBlocks/JsonApiStringConverter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Text.Json;
@@ -16,7 +14,7 @@ public static string ExtractErrorId(string responseBody)
             try
             {
                 using JsonDocument document = JsonDocument.Parse(responseBody);
-                return document.RootElement.GetProperty("errors").EnumerateArray().Single().GetProperty("id").GetString();
+                return document.RootElement.GetProperty("errors").EnumerateArray().Single()!.GetProperty("id").GetString()!;
             }
             catch (Exception exception)
             {
diff --git a/test/TestBuildingBlocks/NeverSameResourceChangeTracker.cs b/test/TestBuildingBlocks/NeverSameResourceChangeTracker.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using JsonApiDotNetCore.Resources;
 
 namespace TestBuildingBlocks
diff --git a/test/TestBuildingBlocks/ObjectAssertionsExtensions.cs b/test/TestBuildingBlocks/ObjectAssertionsExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.IO;
 using System.Text;
diff --git a/test/TestBuildingBlocks/QueryableExtensions.cs b/test/TestBuildingBlocks/QueryableExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -17,11 +15,11 @@ public static Task<TResource> FirstWithIdAsync<TResource, TId>(this IQueryable<T
             return resources.FirstAsync(resource => Equals(resource.Id, id), cancellationToken);
         }
 
-        public static Task<TResource> FirstWithIdOrDefaultAsync<TResource, TId>(this IQueryable<TResource> resources, TId id,
+        public static async Task<TResource?> FirstWithIdOrDefaultAsync<TResource, TId>(this IQueryable<TResource> resources, TId id,
             CancellationToken cancellationToken = default)
             where TResource : IIdentifiable<TId>
         {
-            return resources.FirstOrDefaultAsync(resource => Equals(resource.Id, id), cancellationToken);
+            return await resources.FirstOrDefaultAsync(resource => Equals(resource.Id, id), cancellationToken);
         }
     }
 }
diff --git a/test/TestBuildingBlocks/ServiceCollectionExtensions.cs b/test/TestBuildingBlocks/ServiceCollectionExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore;
diff --git a/test/TestBuildingBlocks/TestControllerProvider.cs b/test/TestBuildingBlocks/TestControllerProvider.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Reflection;
diff --git a/test/TestBuildingBlocks/TestableStartup.cs b/test/TestBuildingBlocks/TestableStartup.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using JsonApiDotNetCore.Configuration;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
diff --git a/test/TestBuildingBlocks/Unknown.cs b/test/TestBuildingBlocks/Unknown.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using JsonApiDotNetCore.Resources;
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#nullable disable`
`2`		`-`
`3`	`1`	`using System.Diagnostics.CodeAnalysis;`
`4`	`2`
`5`	`3`	`// https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/MSBuildIntegration.md#excluding-from-coverage`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#nullable disable`
`2`		`-`
`3`	`1`	`using System;`
`4`	`2`
`5`	`3`	`namespace TestBuildingBlocks`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#nullable disable`
`2`		`-`
`3`	`1`	`using Xunit;`
`4`	`2`
`5`	`3`	`namespace TestBuildingBlocks`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#nullable disable`
`2`		`-`
`3`	`1`	`using System.Net;`
`4`	`2`	`using System.Net.Http;`
`5`	`3`	`using FluentAssertions;`