Add more Decorated tests

2 files changed, 23 insertions, 2 deletions

diff --git a/cask/test/src/test/cask/Decorated.scala b/cask/test/src/test/cask/Decorated.scala
index e20149a..3677203 100644
--- a/cask/test/src/test/cask/Decorated.scala
+++ b/cask/test/src/test/cask/Decorated.scala
@@ -3,15 +3,34 @@ import cask.model.ParamContext
 
 
 object Decorated extends cask.MainRoutes{
-  class myDecorator extends cask.Routes.Decorator {
+  class User{
+    override def toString = "[haoyi]"
+  }
+  class loggedIn extends cask.Routes.Decorator {
+    def getRawParams(ctx: ParamContext) = Right(Map("user" -> new User()))
+  }
+  class withExtra extends cask.Routes.Decorator {
     def getRawParams(ctx: ParamContext) = Right(Map("extra" -> 31337))
   }
 
-  @myDecorator()
+  @withExtra()
   @cask.get("/hello/:world")
   def hello(world: String)(extra: Int) = {
     world + extra
   }
 
+  @loggedIn()
+  @cask.get("/internal/:world")
+  def internal(world: String)(user: User) = {
+    world + user
+  }
+
+  @withExtra()
+  @loggedIn()
+  @cask.get("/internal-extra/:world")
+  def internalExtra(world: String)(user: User)(extra: Int) = {
+    world + user + extra
+  }
+
   initialize()
 }
diff --git a/cask/test/src/test/cask/ExampleTests.scala b/cask/test/src/test/cask/ExampleTests.scala
index 50e9776..e5be3bf 100644
--- a/cask/test/src/test/cask/ExampleTests.scala
+++ b/cask/test/src/test/cask/ExampleTests.scala
@@ -88,6 +88,8 @@ object ExampleTests extends TestSuite{
     }
     'Decorated - test(Decorated){ host =>
       requests.get(host + "/hello/woo").text() ==> "woo31337"
+      requests.get(host + "/internal/boo").text() ==> "boo[haoyi]"
+      requests.get(host + "/internal-extra/goo").text() ==> "goo[haoyi]31337"
 
     }
   }