Add MapActionEndpointDataSourceBuilderExtensionsTest

Author: halter73

src/Http/Routing/src/MapAction/MapActionEndpointRouteBuilderExtensions.cs

@@ -37,7 +37,6 @@ public static IEndpointConventionBuilder MapAction(
             }
 
             var requestDelegate = MapActionExpressionTreeBuilder.BuildRequestDelegate(action);
-            var httpMethodMetadata = GenerateHtpMethodMetadata(action.Method);
 
             var routeAttributes = action.Method.GetCustomAttributes().OfType<IRouteTemplateProvider>();
             var conventionBuilders = new List<IEndpointConventionBuilder>();
@@ -57,11 +56,6 @@ public static IEndpointConventionBuilder MapAction(
                     {
                         endpointBuilder.Metadata.Add(attribute);
                     }
-
-                    if (httpMethodMetadata is not null)
-                    {
-                        endpointBuilder.Metadata.Add(httpMethodMetadata);
-                    }
                 });
 
                 conventionBuilders.Add(conventionBuilder);
@@ -75,23 +69,6 @@ public static IEndpointConventionBuilder MapAction(
             return new CompositeEndpointConventionBuilder(conventionBuilders);
         }
 
-        private static HttpMethodMetadata? GenerateHtpMethodMetadata(MethodInfo methodInfo)
-        {
-            var httpMethods = methodInfo
-                .GetCustomAttributes()
-                .OfType<IHttpMethodMetadata>()
-                .SelectMany(a => a.HttpMethods)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .ToArray();
-
-            if (httpMethods.Length == 0)
-            {
-                return null;
-            }
-
-            return new HttpMethodMetadata(httpMethods);
-        }
-
         private class CompositeEndpointConventionBuilder : IEndpointConventionBuilder
         {
             private readonly List<IEndpointConventionBuilder> _endpointConventionBuilders;

src/Http/Routing/test/FunctionalTests/MapActionTest.cs

@@ -24,7 +24,7 @@ public class MapActionTest
         [Fact]
         public async Task MapAction_FromBodyWorksWithJsonPayload()
         {
-            [HttpPost("/EchoTodo")]
+            [HttpMethods(new[] { "POST" }, "/EchoTodo")]
             Todo EchoTodo([FromBody] Todo todo) => todo;
 
             using var host = new HostBuilder()
@@ -51,7 +51,7 @@ public async Task MapAction_FromBodyWorksWithJsonPayload()
 
             var todo = new Todo
             {
-                Name = "Custom Todo"
+                Name = "Write tests!"
             };
 
             var response = await client.PostAsJsonAsync("/EchoTodo", todo);
@@ -71,16 +71,17 @@ private class Todo
 
         private class FromBodyAttribute : Attribute, IFromBodyMetadata { }
 
-        private class HttpPostAttribute : Attribute, IRouteTemplateProvider, IHttpMethodMetadata
+        private class HttpMethodsAttribute : Attribute, IRouteTemplateProvider, IHttpMethodMetadata
         {
-            public HttpPostAttribute(string template)
+            public HttpMethodsAttribute(string[] httpMethods, string? template)
             {
+                HttpMethods = httpMethods;
                 Template = template;
             }
 
-            public string Template { get; }
+            public string? Template { get; }
 
-            public IReadOnlyList<string> HttpMethods { get; } = new[] { "POST" };
+            public IReadOnlyList<string> HttpMethods { get; }
 
             public int? Order => null;
 

src/Http/Routing/test/UnitTests/Builder/MapActionEndpointRouteBuilderExtensionsTest.cs

@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    public class MapActionEndpointDataSourceBuilderExtensionsTest
+    {
+        private ModelEndpointDataSource GetBuilderEndpointDataSource(IEndpointRouteBuilder endpointRouteBuilder)
+        {
+            return Assert.IsType<ModelEndpointDataSource>(Assert.Single(endpointRouteBuilder.DataSources));
+        }
+
+        private RouteEndpointBuilder GetRouteEndpointBuilder(IEndpointRouteBuilder endpointRouteBuilder)
+        {
+            return Assert.IsType<RouteEndpointBuilder>(Assert.Single(GetBuilderEndpointDataSource(endpointRouteBuilder).EndpointBuilders));
+        }
+
+        [Fact]
+        public void MapAction_BuildsEndpointFromAttributes()
+        {
+            const string customMethod = "CUSTOM_METHOD";
+            const string customTemplate = "/CustomTemplate";
+
+            [HttpMethods(new[] { customMethod }, customTemplate)]
+            void MyAction() { };
+
+            var builder = new DefaultEndpointRouteBuilder(Mock.Of<IApplicationBuilder>());
+            var endpointBuilder = builder.MapAction((Action)MyAction);
+
+            var dataSource = Assert.Single(builder.DataSources);
+            var endpoint = Assert.Single(dataSource.Endpoints);
+
+            var httpMethodMetadata = Assert.Single(endpoint.Metadata.OfType<IHttpMethodMetadata>());
+            var method = Assert.Single(httpMethodMetadata.HttpMethods);
+            Assert.Equal(customMethod, method);
+
+            var routeEndpointBuilder = GetRouteEndpointBuilder(builder);
+            Assert.Equal(customTemplate, routeEndpointBuilder.RoutePattern.RawText);
+        }
+
+        private class HttpMethodsAttribute : Attribute, IRouteTemplateProvider, IHttpMethodMetadata
+        {
+            public HttpMethodsAttribute(string[] httpMethods, string? template)
+            {
+                HttpMethods = httpMethods;
+                Template = template;
+            }
+
+            public string? Template { get; }
+
+            public IReadOnlyList<string> HttpMethods { get; }
+
+            public int? Order => null;
+
+            public string? Name => null;
+
+            public bool AcceptCorsPreflight => false;
+        }
+    }
+}