routing complier bug fixed & add routing unit test

Author: yb-nuc

CatLib.VS/CatLib.Tests/CatLib.Tests.csproj

@@ -77,6 +77,7 @@
  <Compile Include="Config\ConfigTests.cs" />
  <Compile Include="Config\ConfigProviderTests.cs" />
  <Compile Include="Core\EnvTests.cs" />
+ <Compile Include="Routing\AttrCompilerRouting.cs" />
  <Compile Include="Routing\RouterExceptionTests.cs" />
  <Compile Include="Stl\Container\BindDataTests.cs" />
  <Compile Include="Stl\Container\ContainerTests.cs" />

CatLib.VS/CatLib.Tests/Routing/AttrCompilerRouting.cs

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the CatLib package.
+ *
+ * (c) Yu Bin <support@catlib.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Document: http://catlib.io/
+ */
+
+using CatLib.API.Routing;
+
+namespace CatLib.Tests.Routing
+{
+ [Routed]
+ public class AttrCompilerRouting
+ {
+ [Routed("routed://first-compiler-then-group/{str?}",Group = "DefaultGroup")]
+ public void FirstCompilerThenAddGroup(IRequest request,IResponse response)
+ {
+ response.SetContext(request["str"]);
+ }
+
+ [Routed("routed://use-group-and-local-defaults/{str?}",Group = "DefaultGroup2" , Defaults = "str=>hello world")]
+ public void UseGroupAndLocalDefaults(IRequest request, IResponse response)
+ {
+ response.SetContext(request["str"]);
+ }
+ }
+}

CatLib.VS/CatLib.Tests/Routing/RouterTests.cs

@@ -59,6 +59,7 @@ public void TestInitialize()
  next(req, res);
  res.SetContext(res.GetContext() + "[with throw error group middleware]");
  });
+ router.Group("DefaultGroup2").Defaults("str", "TestUseGroupAndLocalDefaults");
  });
 
  app.On(RouterEvents.OnDispatcher, (sender, args) =>
@@ -529,5 +530,22 @@ public void TestUndefindScheme()
 
  router.SetDefaultScheme("catlib");
  }
+
+ [TestMethod]
+ public void TestFirstCompilerThenAddGroup()
+ {
+ var router = App.Instance.Make<IRouter>();
+ router.Group("DefaultGroup").Defaults("str", "TestFirstCompilerThenAddGroup");
+ var response = router.Dispatch("routed://first-compiler-then-group");
+ Assert.AreEqual("TestFirstCompilerThenAddGroup[global middleware]", response.GetContext());
+ }
+
+ [TestMethod]
+ public void TestUseGroupAndLocalDefaults()
+ {
+ var router = App.Instance.Make<IRouter>();
+ var response = router.Dispatch("routed://use-group-and-local-defaults");
+ Assert.AreEqual("hello world[global middleware]", response.GetContext());
+ }
  }
 }

CatLib.VS/CatLib/Routing/AttrRouteCompiler.cs

@@ -152,9 +152,9 @@ private void ComplieController(Type type, RoutedAttribute baseRouted)
 
  foreach (var route in routeList)
  {
- ComplieOptionsGroup(route, baseRouted);
  ComplieOptionsWhere(route, controllerWhere);
  ComplieOptionsDefaults(route, controllerDefaults);
+ ComplieOptionsGroup(route, baseRouted);
  }
  }
 
@@ -245,9 +245,9 @@ private void CheckRepeat(string path, Type controllerType, MethodInfo method)
  /// <param name="routed">路由特性</param>
  private void ComplieOptions(IRoute route, RoutedAttribute routed)
  {
- ComplieOptionsGroup(route, routed);
  ComplieOptionsWhere(route, ComplieDirection(routed.Where));
  ComplieOptionsDefaults(route, ComplieDirection(routed.Defaults));
+ ComplieOptionsGroup(route, routed);
  }
 
  /// <summary>