Tweak test that verifies exception when sync validation goes async (#65)

DamianEdwards · Apr 22, 2024 · 9eb92f5 · 9eb92f5
1 parent 72ff543
commit 9eb92f5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/src/MiniValidation/MiniValidator.cs b/src/MiniValidation/MiniValidator.cs
@@ -198,6 +198,7 @@ private static bool TryValidateImpl<TTarget>(TTarget target, IServiceProvider? s
             catch (Exception)
             {
 #if NET6_0_OR_GREATER
+                // Always observe the ValueTask
                 _ = validateTask.AsTask().GetAwaiter().GetResult();
 #else
                 _ = validateTask.GetAwaiter().GetResult();
@@ -435,6 +436,7 @@ private static async Task<bool> TryValidateImpl(
                 }
                 catch (Exception)
                 {
+                    // Always observe the ValueTask
                     _ = await validateTask.ConfigureAwait(false);
                     throw;
                 }
@@ -465,6 +467,7 @@ private static async Task<bool> TryValidateImpl(
                             }
                             catch (Exception)
                             {
+                                // Always observe the ValueTask
                                 _ = await validateTask.ConfigureAwait(false);
                                 throw;
                             }
@@ -482,7 +485,8 @@ private static async Task<bool> TryValidateImpl(
                             }
                             catch (Exception)
                             {
-                                await validateTask.ConfigureAwait(false);
+                                // Always observe the ValueTask
+                                _ = await validateTask.ConfigureAwait(false);
                                 throw;
                             }
 
@@ -518,15 +522,7 @@ private static async Task<bool> TryValidateImpl(
             validationContext.DisplayName = validationContext.ObjectType.Name;
 
             var validateTask = validatable.ValidateAsync(validationContext);
-            try
-            {
-                ThrowIfAsyncNotAllowed(validateTask.IsCompleted, allowAsync);
-            }
-            catch (Exception)
-            {
-                _ = await validateTask.ConfigureAwait(false);
-                throw;
-            }
+            ThrowIfAsyncNotAllowed(validateTask.IsCompleted, allowAsync);
 
             var validatableResults = await validateTask.ConfigureAwait(false);
             if (validatableResults is not null)
@@ -591,6 +587,7 @@ private static async Task<bool> TryValidateEnumerable(
                 }
                 catch (Exception)
                 {
+                    // Always observe the ValueTask
                     _ = await validateTask.ConfigureAwait(false);
                     throw;
                 }

diff --git a/tests/MiniValidation.UnitTests/Recursion.cs b/tests/MiniValidation.UnitTests/Recursion.cs
@@ -1,4 +1,6 @@
-namespace MiniValidation.UnitTests;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace MiniValidation.UnitTests;
 
 public class Recursion
 {
@@ -412,21 +414,28 @@ public void Invalid_When_AsyncValidatableOnlyChild_Is_Invalid_Allowing_SyncOverA
         Assert.Equal($"{nameof(TestTypeWithAsyncChild.NeedsAsync)}.{nameof(TestAsyncValidatableChildType.TwentyOrMore)}", errors.Keys.First());
     }
 
-    [Fact(Skip = "Unreliable on CI, can reproduce on dev machine with loop count 100+. See https://github.com/xunit/xunit/issues/2917")]
+    [Fact]
     public void Throws_InvalidOperationException_When_Polymorphic_AsyncValidatableOnlyChild_Is_Invalid_Without_Allowing_SyncOverAsync()
     {
         var thingToValidate = new TestValidatableType
         {
             PocoChild = new TestAsyncValidatableChildType { TwentyOrMore = 12 }
         };
 
-        for (int i = 0; i < 10000; i++)
+        Assert.Throws<InvalidOperationException>(() =>
         {
-            Assert.Throws<InvalidOperationException>(() =>
+            var tcs = new TaskCompletionSource<object?>();
+            var serviceProvider = new ServiceCollection().AddSingleton<Task>(tcs.Task).BuildServiceProvider();
+
+            try
             {
-                var result = MiniValidator.TryValidate(thingToValidate, out var errors);
-            });
-        }
+                var result = MiniValidator.TryValidate(thingToValidate, serviceProvider, out var errors);
+            }
+            finally
+            {
+                tcs.SetResult(null);
+            }
+        });
     }
 
     [Fact]

diff --git a/tests/MiniValidation.UnitTests/TestTypes.cs b/tests/MiniValidation.UnitTests/TestTypes.cs
@@ -1,4 +1,6 @@
-namespace MiniValidation.UnitTests;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace MiniValidation.UnitTests;
 
 class TestType
 {
@@ -182,7 +184,11 @@ class TestAsyncValidatableChildType : TestChildType, IAsyncValidatableObject
 
     public async Task<IEnumerable<ValidationResult>> ValidateAsync(ValidationContext validationContext)
     {
-        await Task.Yield();
+        var taskToAwait = validationContext.GetService<Task>();
+        if (taskToAwait is not null)
+        {
+            await taskToAwait;
+        }
 
         List<ValidationResult>? result = null;
         if (TwentyOrMore < 20)