Fixed failing route unit tests because of the Endpoint routing (#326)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/ApplicationBuilderMock.cs

@@ -9,9 +9,11 @@
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Http.Features;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Routing;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Options;
+    using Utilities;
     using Utilities.Extensions;
 
     /// <summary>
@@ -162,6 +164,8 @@ private void ExtractEndpointRoutes(Func<RequestDelegate, RequestDelegate> middle
                 var allRouteEndpoints = endpointDataSource
                     .Endpoints
                     .OfType<RouteEndpoint>()
+                    .Where(route => route.Metadata.All(m => 
+                        Reflection.AreNotAssignable(typeof(IRouteTemplateProvider), m.GetType())))
                     .OrderBy(route => route.Order)
                     .ForEach(route =>
                     {

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationRouter.cs

@@ -52,7 +52,7 @@ private static void PrepareApplicationAndRouting()
 
             var attributeRoutingType = WebFramework.Internals.AttributeRouting;
 
-            if (routeBuilderRoutes[0].GetType() != attributeRoutingType)
+            if (!routeBuilderRoutes[0].GetType().Name.StartsWith(nameof(Attribute)))
             {
                 var createAttributeMegaRouteMethod = attributeRoutingType.GetMethod("CreateAttributeMegaRoute");
                 var router = (IRouter)createAttributeMegaRouteMethod.Invoke(null, new[] { serviceProvider });

test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs

@@ -301,7 +301,7 @@ public void DefaultConfigAndAdditionalRoutesShouldSetOnlyThem()
             var setRoutes = TestApplication.Router as RouteCollection;
 
             Assert.NotNull(setRoutes);
-            Assert.Equal(1, setRoutes.Count);
+            Assert.Equal(3, setRoutes.Count);
         }
 
         [Fact]
@@ -406,7 +406,7 @@ public void WithCustomStartupAndAdditionalRoutesShouldWorkCorrectly()
             var routesCollection = TestApplication.Router as RouteCollection;
 
             Assert.NotNull(routesCollection);
-            Assert.Equal(1, routesCollection.Count);
+            Assert.Equal(3, routesCollection.Count);
 
             MyApplication.StartsFrom<DefaultStartup>();
         }
@@ -737,5 +737,37 @@ public void RegisteringServerServicesTwiceShouldResolveThemCorrectly()
 
             MyApplication.StartsFrom<DefaultStartup>();
         }
+
+        [Fact]
+        public void LegacyRoutesShouldHaveAttributeRouteRegistered()
+        {
+            MyApplication.StartsFrom<NoEndpointsStartup>();
+
+            var routes = TestApplication.Router as RouteCollection;
+
+            Assert.NotNull(routes);
+
+            var attributeRoute = routes[0];
+
+            Assert.NotNull(attributeRoute);
+            Assert.Contains(nameof(Attribute), attributeRoute.GetType().Name);
+
+            MyApplication.StartsFrom<DefaultStartup>();
+        }
+
+        [Fact]
+        public void EndpointRoutesShouldHaveAttributeRouteRegistered()
+        {
+            MyApplication.StartsFrom<DefaultStartup>();
+
+            var routes = TestApplication.Router as RouteCollection;
+
+            Assert.NotNull(routes);
+
+            var attributeRoute = routes[0];
+
+            Assert.NotNull(attributeRoute);
+            Assert.Contains(nameof(Attribute), attributeRoute.GetType().Name);
+        }
     }
 }