Merge pull request #4804 from nunit/fix-value-task-awaiter

stevenaw · web-flow · commit 116802d7be76 · 2024-08-30T14:37:01.000-04:00
Use default blocking strategy for valuetasks
diff --git a/src/NUnitFramework/framework/Internal/ValueTaskAwaitAdapter.cs b/src/NUnitFramework/framework/Internal/ValueTaskAwaitAdapter.cs
@@ -27,7 +27,7 @@ public static AwaitAdapter Create(ValueTask task)
             return null;
         }
 
-        private sealed class NonGenericAdapter : AwaitAdapter
+        private sealed class NonGenericAdapter : DefaultBlockingAwaitAdapter
         {
             private readonly ValueTaskAwaiter _awaiter;
 
@@ -40,17 +40,14 @@ public NonGenericAdapter(ValueTask task)
 
             public override void OnCompleted(Action action) => _awaiter.UnsafeOnCompleted(action);
 
-            // Assumption that GetResult blocks until complete is only valid for System.Threading.Tasks.ValueTask.
-            public override void BlockUntilCompleted() => _awaiter.GetResult();
-
             public override object? GetResult()
             {
                 _awaiter.GetResult(); // Throws exceptions, if any
                 return null;
             }
         }
 
-        private sealed class GenericAdapter<T> : AwaitAdapter
+        private sealed class GenericAdapter<T> : DefaultBlockingAwaitAdapter
         {
             private readonly ValueTaskAwaiter<T> _awaiter;
 
@@ -63,9 +60,6 @@ public GenericAdapter(ValueTask<T> task)
 
             public override void OnCompleted(Action action) => _awaiter.UnsafeOnCompleted(action);
 
-            // Assumption that GetResult blocks until complete is only valid for System.Threading.Tasks.ValueTask.
-            public override void BlockUntilCompleted() => _awaiter.GetResult();
-
             public override object? GetResult()
             {
                 return _awaiter.GetResult(); // Throws exceptions, if any
diff --git a/src/NUnitFramework/tests/Attributes/TestCaseSourceTests.cs b/src/NUnitFramework/tests/Attributes/TestCaseSourceTests.cs
@@ -741,6 +741,21 @@ private static IEnumerable ExceptionSource
             }
         }
         #endregion
+
+        [TestCaseSource(nameof(AsyncEnumerableTestCases))]
+        public async Task TestAsyncEnumerable(int expected, int actual)
+        {
+            await Task.Delay(100); // Simulate an asynchronous operation
+            Assert.That(actual, Is.EqualTo(expected));
+        }
+
+        private static async IAsyncEnumerable<TestCaseData> AsyncEnumerableTestCases()
+        {
+            await Task.Delay(100); // Simulate an asynchronous operation
+            yield return new TestCaseData(42, 42);
+            await Task.Delay(100); // Simulate another asynchronous operation
+            yield return new TestCaseData(51, 51);
+        }
     }
 
     public class TestSourceMayBeInherited

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static AwaitAdapter Create(ValueTask task)`
`27`	`27`	`return null;`
`28`	`28`	`}`
`29`	`29`
`30`		`- private sealed class NonGenericAdapter : AwaitAdapter`
	`30`	`+ private sealed class NonGenericAdapter : DefaultBlockingAwaitAdapter`
`31`	`31`	`{`
`32`	`32`	`private readonly ValueTaskAwaiter _awaiter;`
`33`	`33`
`@@ -40,17 +40,14 @@ public NonGenericAdapter(ValueTask task)`
`40`	`40`
`41`	`41`	`public override void OnCompleted(Action action) => _awaiter.UnsafeOnCompleted(action);`
`42`	`42`
`43`		`- // Assumption that GetResult blocks until complete is only valid for System.Threading.Tasks.ValueTask.`
`44`		`- public override void BlockUntilCompleted() => _awaiter.GetResult();`
`45`		`-`
`46`	`43`	`public override object? GetResult()`
`47`	`44`	`{`
`48`	`45`	`_awaiter.GetResult(); // Throws exceptions, if any`
`49`	`46`	`return null;`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`
`53`		`- private sealed class GenericAdapter<T> : AwaitAdapter`
	`50`	`+ private sealed class GenericAdapter<T> : DefaultBlockingAwaitAdapter`
`54`	`51`	`{`
`55`	`52`	`private readonly ValueTaskAwaiter<T> _awaiter;`
`56`	`53`
`@@ -63,9 +60,6 @@ public GenericAdapter(ValueTask<T> task)`
`63`	`60`
`64`	`61`	`public override void OnCompleted(Action action) => _awaiter.UnsafeOnCompleted(action);`
`65`	`62`
`66`		`- // Assumption that GetResult blocks until complete is only valid for System.Threading.Tasks.ValueTask.`
`67`		`- public override void BlockUntilCompleted() => _awaiter.GetResult();`
`68`		`-`
`69`	`63`	`public override object? GetResult()`
`70`	`64`	`{`
`71`	`65`	`return _awaiter.GetResult(); // Throws exceptions, if any`