Improve async code handling in tests

Author: lord-executor

src/Ninject.Web.AspNetCore.Test/Unit/DisposalManagerConcurrencyTest.cs

@@ -11,7 +11,7 @@ namespace Ninject.Web.AspNetCore.Test.Unit
 	public class DisposalManagerConcurrencyTest
 	{
 		[Fact]
-		public void CreateArea_FromDifferentConcurrentThreads_ShouldCreateSeparateRootAreas()
+		public async Task CreateArea_FromDifferentConcurrentThreads_ShouldCreateSeparateRootAreas()
 		{
 			var disposalManager = new DisposalManager(new FakeActivationCacheAccessor(Enumerable.Empty<object>()));
 			var barrier = new Barrier(2);
@@ -31,15 +31,15 @@ public void CreateArea_FromDifferentConcurrentThreads_ShouldCreateSeparateRootAr
 				return identifier;
 			})).ToList();
 
-			var results = tasks.Select(t => t.Result).ToList();
+			var results = (await Task.WhenAll(tasks)).ToList();
 
 			results.Count.Should().Be(2);
 			results.All(r => r.StartsWith("OrderedAggregateDisposalArea")).Should().BeTrue();
 			results[0].Should().NotBe(results[1]);
 		}
 
 		[Fact]
-		public void ServiceDisposal_FromDifferentConcurrentThreads_ShouldDisposeServicesSeparately()
+		public async Task ServiceDisposal_FromDifferentConcurrentThreads_ShouldDisposeServicesSeparately()
 		{
 			var taskCount = 7;
 			var serviceCount = 100;
@@ -52,18 +52,16 @@ public void ServiceDisposal_FromDifferentConcurrentThreads_ShouldDisposeServices
 			var tasks = Enumerable.Range(0, taskCount).Select(index => Task.Run(() =>
 			{
 				barrier.SignalAndWait();
-				using (var area = disposalManager.CreateArea())
-				{
-					barrier.SignalAndWait();
+				using var area = disposalManager.CreateArea();
+				barrier.SignalAndWait();
 
-					foreach (var r in references.Where((_, referenceIndex) => referenceIndex % (taskCount + 1) == index))
-					{
-						disposalManager.RemoveInstance(new Activation.InstanceReference { Instance = r });
-					}
+				foreach (var r in references.Where((_, referenceIndex) => referenceIndex % (taskCount + 1) == index))
+				{
+					disposalManager.RemoveInstance(new Activation.InstanceReference { Instance = r });
 				}
 			})).ToList();
 
-			Task.WaitAll(tasks.ToArray());
+			await Task.WhenAll(tasks.ToArray());
 
 			references.Where((_, index) => index % (taskCount + 1) < taskCount).All(r => r.IsDisposed).Should().BeTrue();
 			references.Where((_, index) => index % (taskCount + 1) == taskCount).All(r => r.IsDisposed).Should().BeFalse();

src/Ninject.Web.AspNetCore.Test/Unit/RequestScopeMiddlewareTest.cs

@@ -10,7 +10,7 @@ namespace Ninject.Web.AspNetCore.Test.Unit
 	public class RequestScopeMiddlewareTest
 	{
 		[Fact]
-		public void Middleware_WhenInvoked_CreatesAndDestroysRequestScope()
+		public async Task Middleware_WhenInvoked_CreatesAndDestroysRequestScope()
 		{
 			var callCount = 0;
 			var middleware = new RequestScopeMiddleware(_ =>
@@ -25,7 +25,7 @@ public void Middleware_WhenInvoked_CreatesAndDestroysRequestScope()
 			var httpContextMock = new Mock<HttpContext>();
 
 			RequestScope.Current.Should().BeNull();
-			middleware.InvokeAsync(httpContextMock.Object).Wait();
+			await middleware.InvokeAsync(httpContextMock.Object);
 			callCount.Should().Be(1);
 			RequestScope.Current.Should().BeNull();
 		}