Skip to content

Commit da2f223

Browse files
committed
Extracted common attribute route logic in ApplicationBuilderMock (#326)
1 parent 6c32709 commit da2f223

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,6 @@ private void ExtractEndpointRoutes(Func<RequestDelegate, RequestDelegate> middle
222222
}
223223
}
224224

225-
var attributeRoutingType = WebFramework.Internals.AttributeRouting;
226-
var createAttributeMegaRouteMethod = attributeRoutingType.GetMethod("CreateAttributeMegaRoute");
227-
var router = (IRouter)createAttributeMegaRouteMethod.Invoke(null, new[] { this.ApplicationServices });
228-
229-
routeBuilder.Routes.Insert(0, router);
230-
231225
var routes = routeBuilder.Routes;
232226

233227
for (int i = 0; i < routes.Count; i++)

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,23 @@ private static void PrepareApplicationAndRouting()
4343

4444
AdditionalRouting?.Invoke(routeBuilder);
4545

46-
if (StartupType == null || routeBuilder.Routes.Count == 0)
46+
var routeBuilderRoutes = routeBuilder.Routes;
47+
48+
if (StartupType == null || routeBuilderRoutes.Count == 0)
4749
{
4850
routeBuilder.MapRoute(
4951
name: "default",
5052
template: "{controller=Home}/{action=Index}/{id?}");
53+
}
5154

52-
var attributeRoutingType = WebFramework.Internals.AttributeRouting;
55+
var attributeRoutingType = WebFramework.Internals.AttributeRouting;
56+
57+
if (routeBuilderRoutes[0].GetType() != attributeRoutingType)
58+
{
5359
var createAttributeMegaRouteMethod = attributeRoutingType.GetMethod("CreateAttributeMegaRoute");
5460
var router = (IRouter)createAttributeMegaRouteMethod.Invoke(null, new[] { serviceProvider });
5561

56-
routeBuilder.Routes.Insert(0, router);
62+
routeBuilderRoutes.Insert(0, router);
5763
}
5864

5965
router = routeBuilder.Build();

0 commit comments

Comments
 (0)