Fix async for tests and IValidatableObject

Author: captainsafia

src/Http/Http.Extensions/test/ValidationsGenerator/ValidationsGenerator.ComplexType.cs

@@ -75,7 +75,7 @@ public class SubTypeWithInheritance : SubType
 }
 """;
         await Verify(source, out var compilation);
-        VerifyEndpoint(compilation, "/complex-type", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/complex-type", async (endpoint, serviceProvider) =>
         {
             await InvalidIntegerWithRangeProducesError(endpoint);
             await InvalidIntegerWithRangeAndDisplayNameProducesError(endpoint);

src/Http/Http.Extensions/test/ValidationsGenerator/ValidationsGenerator.IValidatableObject.cs

@@ -46,7 +46,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
         var maximum = rangeService?.GetMaximum();
         if (Value1 < minimum || Value1 > maximum)
         {
-            yield return new ValidationResult($"The field {validationContext.DisplayName} must be between {minimum} and {maximum}.", [nameof(Value1)]);
+            yield return new ValidationResult($"The field {nameof(Value1)} must be between {minimum} and {maximum}.", [nameof(Value1)]);
         }
     }
 }
@@ -88,7 +88,7 @@ public class RangeService : IRangeService
 
         await Verify(source, out var compilation);
 
-        VerifyEndpoint(compilation, "/validatable-object", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/validatable-object", async (endpoint, serviceProvider) =>
         {
             await ValidateMethodCalledIfPropertyValidationsFail();
             await ValidateForSubtypeInvokedFirst();
@@ -126,12 +126,12 @@ async Task ValidateMethodCalledIfPropertyValidationsFail()
                     error =>
                     {
                         Assert.Equal("SubType.Value3", error.Key);
-                        Assert.Equal("The field StringWithLength must be 'some-value'.", error.Value.Single());
+                        Assert.Equal("The field ValidatableSubType must be 'some-value'.", error.Value.Single());
                     },
                     error =>
                     {
                         Assert.Equal("Value1", error.Key);
-                        Assert.Equal("The field Value 1 must be between 10 and 100.", error.Value.Single());
+                        Assert.Equal("The field Value1 must be between 10 and 100.", error.Value.Single());
                     });
             }
 
@@ -157,6 +157,11 @@ async Task ValidateForSubtypeInvokedFirst()
                     {
                         Assert.Equal("SubType.Value3", error.Key);
                         Assert.Equal("The field ValidatableSubType must be 'some-value'.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Value1", error.Key);
+                        Assert.Equal("The field Value1 must be between 10 and 100.", error.Value.Single());
                     });
             }
 
@@ -181,7 +186,7 @@ async Task ValidateForTopLevelInvoked()
                     error =>
                     {
                         Assert.Equal("Value1", error.Key);
-                        Assert.Equal("The field ComplexValidatableType must be between 10 and 100.", error.Value.Single());
+                        Assert.Equal("The field Value1 must be between 10 and 100.", error.Value.Single());
                     });
             }
         });

src/Http/Http.Extensions/test/ValidationsGenerator/ValidationsGenerator.Parameters.cs

@@ -40,7 +40,7 @@ public class CustomValidationAttribute : ValidationAttribute
 }
 """;
         await Verify(source, out var compilation);
-        VerifyEndpoint(compilation, "/params", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/params", async (endpoint, serviceProvider) =>
         {
             var context = CreateHttpContext(serviceProvider);
             context.Request.QueryString = new QueryString("?value1=5&value2=5&value3=&value4=3&value5=5");

src/Http/Http.Extensions/test/ValidationsGenerator/ValidationsGenerator.Polymorphism.cs

@@ -79,7 +79,7 @@ public class DerivedValidatableType : BaseValidatableType
 """;
         await Verify(source, out var compilation);
 
-        VerifyEndpoint(compilation, "/basic-polymorphism", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/basic-polymorphism", async (endpoint, serviceProvider) =>
         {
             var httpContext = CreateHttpContextWithPayload("""
             {
@@ -111,7 +111,7 @@ public class DerivedValidatableType : BaseValidatableType
                 });
         });
 
-        VerifyEndpoint(compilation, "/validatable-polymorphism", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/validatable-polymorphism", async (endpoint, serviceProvider) =>
         {
             var httpContext = CreateHttpContextWithPayload("""
             {
@@ -155,7 +155,7 @@ public class DerivedValidatableType : BaseValidatableType
                 });
         });
 
-        VerifyEndpoint(compilation, "/polymorphism-container", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/polymorphism-container", async (endpoint, serviceProvider) =>
         {
             var httpContext = CreateHttpContextWithPayload("""
             {

src/Http/Http.Extensions/test/ValidationsGenerator/ValidationsGenerator.Recursion.cs

@@ -33,7 +33,7 @@ public class RecursiveType
 """;
         await Verify(source, out var compilation);
 
-        VerifyEndpoint(compilation, "/recursive-type", async (endpoint, serviceProvider) =>
+        await VerifyEndpoint(compilation, "/recursive-type", async (endpoint, serviceProvider) =>
         {
             var httpContext = CreateHttpContextWithPayload("""
             {

src/Http/Http.Extensions/test/ValidationsGenerator/ValidationsGeneratorTestBase.cs

@@ -94,7 +94,7 @@ internal static void VerifyValidatableType(Compilation compilation, string typeN
         verifyFunc(validatableTypeInfo);
     }
 
-    internal static void VerifyEndpoint(Compilation compilation, string routePattern, Action<Endpoint, IServiceProvider> verifyFunc)
+    internal static async Task VerifyEndpoint(Compilation compilation, string routePattern, Func<Endpoint, IServiceProvider, Task> verifyFunc)
     {
         if (TryResolveServicesFromCompilation(compilation, targetAssemblyName: "Microsoft.AspNetCore.Routing", typeName: "Microsoft.AspNetCore.Routing.EndpointDataSource", out var services, out var serviceType, out var outputAssemblyName) is false)
         {
@@ -103,7 +103,7 @@ internal static void VerifyEndpoint(Compilation compilation, string routePattern
         var service = services.GetService(serviceType) ?? throw new InvalidOperationException("Could not resolve EndpointDataSource.");
         var endpoints = (IReadOnlyList<Endpoint>)service.GetType().GetProperty("Endpoints", BindingFlags.Instance | BindingFlags.Public).GetValue(service);
         var endpoint = endpoints.FirstOrDefault(endpoint => endpoint is RouteEndpoint routeEndpoint && routeEndpoint.RoutePattern.RawText == routePattern);
-        verifyFunc(endpoint, services);
+        await verifyFunc(endpoint, services);
     }
 
     private static bool TryResolveServicesFromCompilation(Compilation compilation, string targetAssemblyName, string typeName, out IServiceProvider serviceProvider, out Type serviceType, out string outputAssemblyName)

src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject#ValidatableInfoResolver.g.verified.cs

@@ -220,7 +220,7 @@ private ValidatableParameterInfo CreateParameterInfomodel()
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
     file static class GeneratedServiceCollectionExtensions
     {
-        [global::System.Runtime.CompilerServices.InterceptsLocationAttribute(1, "ZbyAIis29Y/4fT/GGaRWq7ABAABQcm9ncmFtLmNz")]
+        [global::System.Runtime.CompilerServices.InterceptsLocationAttribute(1, "uQnZr9MSHY6ZEeLkq015qrABAABQcm9ncmFtLmNz")]
         public static IServiceCollection AddValidation(this IServiceCollection services, Action<ValidationOptions>? configureOptions = null)
         {
             // Use non-extension method to avoid infinite recursion.