Fix AcceptedAtRoute link generation and add tests (dotnet#46724)

Applesauce314 · Feb 18, 2023 · 320c6a6 · 320c6a6
1 parent c8a77ae
commit 320c6a6
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 22 deletions.
diff --git a/src/Http/Http.Results/src/AcceptedAtRoute.cs b/src/Http/Http.Results/src/AcceptedAtRoute.cs
@@ -79,7 +79,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         ArgumentNullException.ThrowIfNull(httpContext);
 
         var linkGenerator = httpContext.RequestServices.GetRequiredService<LinkGenerator>();
-        var url = linkGenerator.GetUriByAddress(
+        var url = linkGenerator.GetUriByRouteValues(
             httpContext,
             RouteName,
             RouteValues,

diff --git a/src/Http/Http.Results/src/AcceptedAtRouteOfT.cs b/src/Http/Http.Results/src/AcceptedAtRouteOfT.cs
@@ -93,7 +93,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         ArgumentNullException.ThrowIfNull(httpContext);
 
         var linkGenerator = httpContext.RequestServices.GetRequiredService<LinkGenerator>();
-        var url = linkGenerator.GetUriByAddress(
+        var url = linkGenerator.GetUriByRouteValues(
             httpContext,
             RouteName,
             RouteValues,

diff --git a/src/Http/Http.Results/test/AcceptedAtRouteOfTResultTests.cs b/src/Http/Http.Results/test/AcceptedAtRouteOfTResultTests.cs
@@ -97,6 +97,7 @@ public async Task ExecuteResultAsync_SetsStatusCodeAndLocationHeader(object valu
         // Assert
         Assert.Equal(StatusCodes.Status202Accepted, httpContext.Response.StatusCode);
         Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        Assert.Equal(new RouteValueDictionary(values), linkGenerator.RouteValuesAddress.ExplicitValues);
     }
 
     [Fact]

diff --git a/src/Http/Http.Results/test/AcceptedAtRouteResultTests.cs b/src/Http/Http.Results/test/AcceptedAtRouteResultTests.cs
@@ -51,6 +51,7 @@ public async Task ExecuteResultAsync_SetsStatusCodeAndLocationHeader(object valu
         // Assert
         Assert.Equal(StatusCodes.Status202Accepted, httpContext.Response.StatusCode);
         Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        Assert.Equal(new RouteValueDictionary(values), linkGenerator.RouteValuesAddress.ExplicitValues);
     }
 
     [Fact]

diff --git a/src/Http/Http.Results/test/CreatedAtRouteOfTResultTests.cs b/src/Http/Http.Results/test/CreatedAtRouteOfTResultTests.cs
@@ -57,7 +57,8 @@ public async Task CreatedAtRouteResult_ReturnsStatusCode_SetsLocationHeader(obje
     {
         // Arrange
         var expectedUrl = "testAction";
-        var httpContext = GetHttpContext(expectedUrl);
+        var linkGenerator = new TestLinkGenerator { Url = expectedUrl };
+        var httpContext = GetHttpContext(linkGenerator);
 
         // Act
         var result = new CreatedAtRoute<object>(routeName: null, routeValues: values, value: null);
@@ -66,13 +67,15 @@ public async Task CreatedAtRouteResult_ReturnsStatusCode_SetsLocationHeader(obje
         // Assert
         Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
         Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        Assert.Equal(new RouteValueDictionary(values), linkGenerator.RouteValuesAddress.ExplicitValues);
     }
 
     [Fact]
     public async Task CreatedAtRouteResult_ThrowsOnNullUrl()
     {
         // Arrange
-        var httpContext = GetHttpContext(expectedUrl: null);
+        var linkGenerator = new TestLinkGenerator();
+        var httpContext = GetHttpContext(linkGenerator);
 
         var result = new CreatedAtRoute<object>(
             routeName: null,
@@ -173,23 +176,20 @@ private static void PopulateMetadata<TResult>(MethodInfo method, EndpointBuilder
 
     private record Todo(int Id, string Title);
 
-    private static HttpContext GetHttpContext(string expectedUrl)
+    private static HttpContext GetHttpContext(LinkGenerator linkGenerator)
     {
         var httpContext = new DefaultHttpContext();
         httpContext.Request.PathBase = new PathString("");
         httpContext.Response.Body = new MemoryStream();
-        httpContext.RequestServices = CreateServices(expectedUrl);
+        httpContext.RequestServices = CreateServices(linkGenerator);
         return httpContext;
     }
 
-    private static IServiceProvider CreateServices(string expectedUrl)
+    private static IServiceProvider CreateServices(LinkGenerator linkGenerator)
     {
         var services = new ServiceCollection();
         services.AddSingleton<ILoggerFactory, NullLoggerFactory>();
-        services.AddSingleton<LinkGenerator>(new TestLinkGenerator
-        {
-            Url = expectedUrl
-        });
+        services.AddSingleton<LinkGenerator>(linkGenerator);
 
         return services.BuildServiceProvider();
     }

diff --git a/src/Http/Http.Results/test/CreatedAtRouteResultTests.cs b/src/Http/Http.Results/test/CreatedAtRouteResultTests.cs
@@ -40,7 +40,8 @@ public async Task CreatedAtRouteResult_ReturnsStatusCode_SetsLocationHeader(obje
     {
         // Arrange
         var expectedUrl = "testAction";
-        var httpContext = GetHttpContext(expectedUrl);
+        var linkGenerator = new TestLinkGenerator { Url = expectedUrl };
+        var httpContext = GetHttpContext(linkGenerator);
 
         // Act
         var result = new CreatedAtRoute(routeName: null, routeValues: values);
@@ -49,13 +50,15 @@ public async Task CreatedAtRouteResult_ReturnsStatusCode_SetsLocationHeader(obje
         // Assert
         Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
         Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        Assert.Equal(new RouteValueDictionary(values), linkGenerator.RouteValuesAddress.ExplicitValues);
     }
 
     [Fact]
     public async Task CreatedAtRouteResult_ThrowsOnNullUrl()
     {
         // Arrange
-        var httpContext = GetHttpContext(expectedUrl: null);
+        var linkGenerator = new TestLinkGenerator();
+        var httpContext = GetHttpContext(linkGenerator);
 
         var result = new CreatedAtRoute(
             routeName: null,
@@ -119,23 +122,20 @@ public void CreatedAtRouteResult_Implements_IValueHttpResult_Correctly()
     private static void PopulateMetadata<TResult>(MethodInfo method, EndpointBuilder builder)
         where TResult : IEndpointMetadataProvider => TResult.PopulateMetadata(method, builder);
 
-    private static HttpContext GetHttpContext(string expectedUrl)
+    private static HttpContext GetHttpContext(LinkGenerator linkGenerator)
     {
         var httpContext = new DefaultHttpContext();
         httpContext.Request.PathBase = new PathString("");
         httpContext.Response.Body = new MemoryStream();
-        httpContext.RequestServices = CreateServices(expectedUrl);
+        httpContext.RequestServices = CreateServices(linkGenerator);
         return httpContext;
     }
 
-    private static IServiceProvider CreateServices(string expectedUrl)
+    private static IServiceProvider CreateServices(LinkGenerator linkGenerator)
     {
         var services = new ServiceCollection();
         services.AddSingleton<ILoggerFactory, NullLoggerFactory>();
-        services.AddSingleton<LinkGenerator>(new TestLinkGenerator
-        {
-            Url = expectedUrl
-        });
+        services.AddSingleton<LinkGenerator>(linkGenerator);
 
         return services.BuildServiceProvider();
     }

diff --git a/src/Http/Http.Results/test/TestLinkGenerator.cs b/src/Http/Http.Results/test/TestLinkGenerator.cs
@@ -8,6 +8,7 @@ namespace Microsoft.AspNetCore.Http.HttpResults;
 internal sealed class TestLinkGenerator : LinkGenerator
 {
     public string Url { get; set; }
+    public RouteValuesAddress RouteValuesAddress { get; set; }
 
     public override string GetPathByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values, RouteValueDictionary ambientValues = null, PathString? pathBase = null, FragmentString fragment = default, LinkOptions options = null)
     {
@@ -20,8 +21,14 @@ public override string GetPathByAddress<TAddress>(TAddress address, RouteValueDi
     }
 
     public override string GetUriByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values, RouteValueDictionary ambientValues = null, string scheme = null, HostString? host = null, PathString? pathBase = null, FragmentString fragment = default, LinkOptions options = null)
-        => Url;
+        => AssertAddressAndReturnUrl(address);
 
     public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string scheme, HostString host, PathString pathBase = default, FragmentString fragment = default, LinkOptions options = null)
-        => Url;
+        => AssertAddressAndReturnUrl(address);
+
+    private string AssertAddressAndReturnUrl<TAddress>(TAddress address)
+    {
+        RouteValuesAddress = Assert.IsType<RouteValuesAddress>(address);
+        return Url;
+    }
 }