remove .Wait()

Author: Erwinvandervalk

access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs

@@ -28,8 +28,9 @@ static ClientTokenManagementApiTests()
         _jwkJson = JsonSerializer.Serialize(jwk);
     }
 
-    public ClientTokenManagementApiTests()
+    public override async ValueTask InitializeAsync()
     {
+        await base.InitializeAsync();
         var services = new ServiceCollection();
 
         services.AddDistributedMemoryCache();
@@ -55,6 +56,7 @@ public ClientTokenManagementApiTests()
         _clientFactory = provider.GetRequiredService<IHttpClientFactory>();
         _clientOptions = provider.GetRequiredService<IOptionsMonitor<ClientCredentialsClient>>().Get("test");
     }
+
     public class ApiHandler : DelegatingHandler
     {
         private HttpMessageHandler? _innerHandler;

access-token-management/test/AccessTokenManagement.Tests/Framework/GenericHost.cs

@@ -14,7 +14,7 @@
 
 namespace Duende.AccessTokenManagement.Tests;
 
-public class GenericHost
+public class GenericHost : IAsyncDisposable
 {
     public GenericHost(string baseAddress = "https://server")
     {
@@ -178,4 +178,23 @@ public Task IssueSessionCookieAsync(string sub, params Claim[] claims)
     {
         return IssueSessionCookieAsync(claims.Append(new Claim("sub", sub)).ToArray());
     }
+
+    public async ValueTask DisposeAsync()
+    {
+        await CastAndDispose(Server);
+        await CastAndDispose(BrowserClient);
+        await CastAndDispose(HttpClient);
+        await CastAndDispose(HttpMessageHandler);
+        await CastAndDispose(Logger);
+
+        return;
+
+        static async ValueTask CastAndDispose(IDisposable resource)
+        {
+            if (resource is IAsyncDisposable resourceAsyncDisposable)
+                await resourceAsyncDisposable.DisposeAsync();
+            else
+                resource?.Dispose();
+        }
+    }
 }

access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs

@@ -8,7 +8,7 @@
 
 namespace Duende.AccessTokenManagement.Tests;
 
-public class IntegrationTestBase
+public class IntegrationTestBase : IAsyncLifetime
 {
     protected readonly IdentityServerHost IdentityServerHost;
     protected ApiHost ApiHost;
@@ -67,17 +67,27 @@ public IntegrationTestBase(string clientId = "web", Action<UserTokenManagementOp
             AccessTokenLifetime = 10
         });
 
-        IdentityServerHost.InitializeAsync().Wait();
-
         ApiHost = new ApiHost(IdentityServerHost, "scope1");
-        ApiHost.InitializeAsync().Wait();
 
         AppHost = new AppHost(IdentityServerHost, ApiHost, clientId, configureUserTokenManagementOptions: configureUserTokenManagementOptions);
-        AppHost.InitializeAsync().Wait();
     }
 
     public async Task Login(string sub)
     {
         await IdentityServerHost.IssueSessionCookieAsync(new Claim("sub", sub));
     }
+
+    public virtual async ValueTask DisposeAsync()
+    {
+        await IdentityServerHost.DisposeAsync();
+        await ApiHost.DisposeAsync();
+        await AppHost.DisposeAsync();
+    }
+
+    public virtual async ValueTask InitializeAsync()
+    {
+        await ApiHost.InitializeAsync();
+        await AppHost.InitializeAsync();
+        await IdentityServerHost.InitializeAsync();
+    }
 }

identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/DPoP/Framework/GenericHost.cs

@@ -11,7 +11,7 @@
 
 namespace Duende.IdentityModel.OidcClient.DPoP.Framework;
 
-public class GenericHost
+public class GenericHost : IAsyncDisposable
 {
     public GenericHost(string baseAddress = "https://server")
     {
@@ -100,4 +100,21 @@ void ConfigureApp(IApplicationBuilder app)
 
         OnConfigure(app);
     }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (Server != null) await CastAndDispose(Server);
+        if (HttpClient != null) await CastAndDispose(HttpClient);
+        if (Logger != null) await CastAndDispose(Logger);
+
+        return;
+
+        static async ValueTask CastAndDispose(IDisposable resource)
+        {
+            if (resource is IAsyncDisposable resourceAsyncDisposable)
+                await resourceAsyncDisposable.DisposeAsync();
+            else
+                resource?.Dispose();
+        }
+    }
 }

identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/DPoP/Framework/IntegrationTestBase.cs

@@ -3,17 +3,26 @@
 
 namespace Duende.IdentityModel.OidcClient.DPoP.Framework;
 
-public class IntegrationTestBase
+public class IntegrationTestBase : IAsyncLifetime
 {
     protected readonly IdentityServerHost IdentityServerHost;
     protected ApiHost ApiHost;
 
     public IntegrationTestBase()
     {
         IdentityServerHost = new IdentityServerHost();
-        IdentityServerHost.InitializeAsync().Wait();
-
         ApiHost = new ApiHost(IdentityServerHost);
-        ApiHost.InitializeAsync().Wait();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await ApiHost.DisposeAsync();
+        await IdentityServerHost.DisposeAsync();
+    }
+
+    public async ValueTask InitializeAsync()
+    {
+        await ApiHost.InitializeAsync();
+        await IdentityServerHost.InitializeAsync();
     }
 }