Added one more test for DisposeAsync method and made it awaitable.

rsdn · Mar 3, 2024 · ca46ce8 · ca46ce8
1 parent c1a0001
commit ca46ce8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/CodeJam.Main.Tests/DisposableExtensionsTests.cs b/CodeJam.Main.Tests/DisposableExtensionsTests.cs
@@ -60,6 +60,20 @@ public static void DisposeAllMustCollectAllExceptions()
 	}
 
 #if NETSTANDARD21_OR_GREATER || NETCOREAPP30_OR_GREATER
+	[Test]
+	public static async Task DisposeAsyncMustCallDiposeOnce()
+	{
+		const int expectedDisposeCount = 1;
+
+		int actualDisposeCount = 0;
+
+		var objectForDispose = Disposable.Create(() => ++actualDisposeCount);
+
+		await objectForDispose.DisposeAsync();
+
+		Assert.AreEqual(expectedDisposeCount, actualDisposeCount);
+	}
+
 	[Test]
 	public static void DisposeAsyncMustNotBlockThread()
 	{

diff --git a/CodeJam.Main/DisposableExtensions.cs b/CodeJam.Main/DisposableExtensions.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-#if NETSTANDARD21_OR_GREATER || NETCOREAPP30_OR_GREATER
 using System.Threading.Tasks;
-#endif
+
 using CodeJam.Internal;
 
 using JetBrains.Annotations;
@@ -67,12 +66,12 @@ public static void DisposeAll(
 		/// Calls DisposeAsync if <paramref name="disposable"/> implements <see cref="IAsyncDisposable"/>, otherwise
 		/// calls <see cref="IDisposable.Dispose"/>
 		/// </summary>
-		public static ValueTask DisposeAsync(this IDisposable disposable)
+		public static async ValueTask DisposeAsync(this IDisposable disposable)
 		{
 			Code.NotNull(disposable, nameof(disposable));
 			if (disposable is IAsyncDisposable asyncDisposable)
-				return asyncDisposable.DisposeAsync();
-			return new ValueTask(Task.Run(() => disposable.Dispose()));
+				await asyncDisposable.DisposeAsync();
+			await new ValueTask(Task.Run(() => disposable.Dispose()));
 		}
 #endif
 	}