various cleanup

Author: soenneker

src/Abstract/IAsyncSingleton{T}.cs

@@ -32,7 +32,7 @@ public interface IAsyncSingleton<T> : IDisposable, IAsyncDisposable
     ValueTask<T> Get(CancellationToken cancellationToken, params object[] objects);
 
     /// <summary>
-    /// <see cref="Get"/> should be used instead of this if possible. This method can block the calling thread! It's lazy; it's initialized only when retrieving. <para/>
+    /// Get should be used instead of this if possible. This method can block the calling thread! It's lazy; it's initialized only when retrieving. <para/>
     /// This can still be used with an async initialization func, but it will block on the func.
     /// </summary>
     /// <remarks>The initialization func needs to be set before calling this, either in the ctor or via the other methods</remarks>

src/AsyncSingleton.cs

@@ -9,7 +9,7 @@
 namespace Soenneker.Utils.AsyncSingleton;
 
 ///<inheritdoc cref="IAsyncSingleton"/>
-public class AsyncSingleton : IAsyncSingleton
+public sealed class AsyncSingleton : IAsyncSingleton
 {
     private object? _instance;
     private readonly AsyncLock _lock = new();
@@ -263,8 +263,6 @@ public void Dispose()
             // Clear the instance explicitly to allow for garbage collection.
             _instance = null;
         }
-
-        GC.SuppressFinalize(this);
     }
 
     public async ValueTask DisposeAsync()
@@ -278,7 +276,6 @@ public async ValueTask DisposeAsync()
 
         if (localInstance is null)
         {
-            GC.SuppressFinalize(this);
             return;
         }
 
@@ -295,7 +292,5 @@ public async ValueTask DisposeAsync()
 
         // Clear the instance reference explicitly to assist GC
         _instance = null;
-
-        GC.SuppressFinalize(this);
     }
 }

test/Soenneker.Utils.AsyncSingleton.Tests/AsyncSingletonTests.cs

@@ -35,8 +35,8 @@ public async Task Get_in_parallel_should_return_both_instances()
 
         await httpClientSingleton.Init();
 
-        Task t1 = Task.Run(async () => await httpClientSingleton.Init());
-        Task t2 = Task.Run(async () => await httpClientSingleton.Init());
+        Task t1 = Task.Run(async () => await httpClientSingleton.Init(), TestContext.Current.CancellationToken);
+        Task t2 = Task.Run(async () => await httpClientSingleton.Init(), TestContext.Current.CancellationToken);
 
         await Task.WhenAll(t1, t2);
     }
@@ -104,13 +104,17 @@ public async Task DisposeAsync_with_cancellationToken_with_nondisposable_should_
     [Fact]
     public async Task Async_with_object_and_cancellationToken_should_not_throw()
     {
-        var httpClientSingleton = new AsyncSingleton(async (token, _) => new object());
+        var httpClientSingleton = new AsyncSingleton(async (token, _) =>
+        {
+            await Task.Delay(100, token);
+            return new object();
+        });
 
         await httpClientSingleton.Init(CancellationToken.None, 3);
     }
 
     [Fact]
-    public async Task Sync_with_object_and_cancellationToken_should_not_throw()
+    public void Sync_with_object_and_cancellationToken_should_not_throw()
     {
         var httpClientSingleton = new AsyncSingleton((token, obj) => new object());
 
@@ -120,10 +124,11 @@ public async Task Sync_with_object_and_cancellationToken_should_not_throw()
     [Fact]
     public async Task Async_Get_should_only_initialize_once()
     {
-        int x = 0;
+        var x = 0;
 
         var httpClientSingleton = new AsyncSingleton(async () =>
         {
+            await Task.Delay(100);
             x++;
             return new HttpClient();
         });
@@ -136,7 +141,7 @@ public async Task Async_Get_should_only_initialize_once()
     [Fact]
     public async Task Sync_Get_Async_should_only_initialize_once()
     {
-        int x = 0;
+        var x = 0;
 
         var httpClientSingleton = new AsyncSingleton(() =>
         {
@@ -153,7 +158,7 @@ public async Task Sync_Get_Async_should_only_initialize_once()
     [Fact]
     public void Sync_Get_Sync_should_only_initialize_once()
     {
-        int x = 0;
+        var x = 0;
 
         var httpClientSingleton = new AsyncSingleton(() =>
         {

test/Soenneker.Utils.AsyncSingleton.Tests/AsyncSingleton{T}Tests.cs

@@ -113,13 +113,13 @@ public async Task DisposeAsync_with_cancellationToken_with_nondisposable_should_
     [Fact]
     public async Task Async_with_object_and_cancellationToken_should_not_throw()
     {
-        var httpClientSingleton = new AsyncSingleton<object>(async (token, obj) => new object());
+        var httpClientSingleton = new AsyncSingleton<object>(async (token, obj) => { await Task.Delay(100, token); return new object(); });
 
         _ = await httpClientSingleton.Get(CancellationToken.None, 3);
     }
 
     [Fact]
-    public async Task Sync_with_object_and_cancellationToken_should_not_throw()
+    public void Sync_with_object_and_cancellationToken_should_not_throw()
     {
         var httpClientSingleton = new AsyncSingleton<object>((token, obj) => new object());
 
@@ -129,10 +129,11 @@ public async Task Sync_with_object_and_cancellationToken_should_not_throw()
     [Fact]
     public async Task Async_Get_should_only_initialize_once()
     {
-        int x = 0;
+        var x = 0;
 
         var httpClientSingleton = new AsyncSingleton<HttpClient>(async () =>
         {
+            await Task.Delay(100);
             x++;
             return new HttpClient();
         });
@@ -146,7 +147,7 @@ public async Task Async_Get_should_only_initialize_once()
     [Fact]
     public async Task Sync_Get_Async_should_only_initialize_once()
     {
-        int x = 0;
+        var x = 0;
 
         var httpClientSingleton = new AsyncSingleton<HttpClient>(() =>
         {
@@ -163,7 +164,7 @@ public async Task Sync_Get_Async_should_only_initialize_once()
     [Fact]
     public void Sync_Get_Sync_should_only_initialize_once()
     {
-        int x = 0;
+        var x = 0;
 
         var httpClientSingleton = new AsyncSingleton<HttpClient>(() =>
         {