routing bug fixed

Author: yb-nuc

CatLib.Unity/Assets/CatLib.Test/Editor/Core/EnvTests.cs.meta

@@ -35,6 +35,7 @@ public class RouterExceptionTests
  internal Router MakeRouter()
  {
  var app = new CatLib.Core.Application();
+ app.Bootstrap().Init();
  var router = new Router(app, app);
 
  router.SetDefaultScheme("catlib");
@@ -187,7 +188,7 @@ public void TestNestedException()
  router.Dispatch("ui://helloworld/call3");
  }).OnError((req, res, ex ,next) =>
  {
- if (throwError == 0)
+ if (throwError == 1)
  {
  throwError = 10;
  }
@@ -217,7 +218,7 @@ public void TestNestedException()
  router.Dispatch("ui://helloworld/call");
  });
 
- Assert.AreEqual(11, throwError);
+ Assert.AreEqual(12, throwError);
  Assert.AreEqual(0, throwNotFound);
  }
 
@@ -237,7 +238,7 @@ public void TestNestedExceptionInterception()
  router.Dispatch("ui://helloworld/call3");
  }).OnError((req, res, ex, next) =>
  {
- if (throwError == 0)
+ if (throwError == 1)
  {
  throwError = 10;
  }

CatLib.Unity/Assets/CatLib.Test/Editor/Core/EventImplTests.cs.meta

@@ -547,5 +547,22 @@ public void TestUseGroupAndLocalDefaults()
  var response = router.Dispatch("routed://use-group-and-local-defaults");
  Assert.AreEqual("hello world[global middleware]", response.GetContext());
  }
+
+ [TestMethod]
+ public void TestClassMiddlewareThenRouteMiddleware()
+ {
+ var router = App.Instance.Make<IRouter>();
+
+ router.Group("RoutingMiddleware.ClassMiddlewareThenRouteMiddleTest")
+ .Middleware((req, res, next) =>
+ {
+ next(req, res);
+ res.SetContext(res.GetContext() + "[middleware with route group]");
+ });
+
+ var response = router.Dispatch("rm://class-middleware-then-route-middle-test");
+
+ Assert.AreEqual("ClassMiddlewareThenRouteMiddleTest[middleware with route group][with middleware][global middleware]", response.GetContext());
+ }
  }
 }

CatLib.Unity/Assets/CatLib.Test/Editor/Routing/AttrCompilerRouting.cs.meta

@@ -40,5 +40,11 @@ public void Call(IRequest request, IResponse response)
  {
  response.SetContext("RoutingMiddleware.Call");
  }
+
+ [Routed(Group = "RoutingMiddleware.ClassMiddlewareThenRouteMiddleTest")]
+ public void ClassMiddlewareThenRouteMiddleTest(IRequest request, IResponse response)
+ {
+ response.SetContext("ClassMiddlewareThenRouteMiddleTest");
+ }
  }
 }