diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-25 23:36:44 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-25 23:36:44 +0800 |
commit | 712bafb0c903a14dc0bf6b07e5529007635e004a (patch) | |
tree | 9770624d1ed63346ddb120fc6aa4182330694a72 /cask/test/src/test | |
parent | f88c2941efdd8a1bc8f4ea7362c2163918c44a1c (diff) | |
download | cask-712bafb0c903a14dc0bf6b07e5529007635e004a.tar.gz cask-712bafb0c903a14dc0bf6b07e5529007635e004a.tar.bz2 cask-712bafb0c903a14dc0bf6b07e5529007635e004a.zip |
big refactoring in preparation for allowing endpoint filters
Diffstat (limited to 'cask/test/src/test')
-rw-r--r-- | cask/test/src/test/cask/ExampleTests.scala | 5 | ||||
-rw-r--r-- | cask/test/src/test/cask/FormJsonPost.scala | 2 | ||||
-rw-r--r-- | cask/test/src/test/cask/StaticFiles.scala | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cask/test/src/test/cask/ExampleTests.scala b/cask/test/src/test/cask/ExampleTests.scala index c1c007e..b60f30c 100644 --- a/cask/test/src/test/cask/ExampleTests.scala +++ b/cask/test/src/test/cask/ExampleTests.scala @@ -10,8 +10,9 @@ object ExampleTests extends TestSuite{ .setHandler(new BlockingHandler(example.defaultHandler)) .build server.start() - val res = f("http://localhost:8080") - server.stop() + val res = + try f("http://localhost:8080") + finally server.stop() res } diff --git a/cask/test/src/test/cask/FormJsonPost.scala b/cask/test/src/test/cask/FormJsonPost.scala index 2874a52..3679286 100644 --- a/cask/test/src/test/cask/FormJsonPost.scala +++ b/cask/test/src/test/cask/FormJsonPost.scala @@ -5,7 +5,9 @@ import io.undertow.server.HttpServerExchange object FormJsonPost extends cask.MainRoutes{ @cask.postJson("/json") +// @db.validateUser() def jsonEndpoint(x: HttpServerExchange, value1: ujson.Js.Value, value2: Seq[Int]) = { +// (user: db.User) = { "OK " + value1 + " " + value2 } diff --git a/cask/test/src/test/cask/StaticFiles.scala b/cask/test/src/test/cask/StaticFiles.scala index d51b35a..8f4a8ef 100644 --- a/cask/test/src/test/cask/StaticFiles.scala +++ b/cask/test/src/test/cask/StaticFiles.scala @@ -7,7 +7,7 @@ object StaticFiles extends cask.MainRoutes{ } @cask.static("/static") - def staticRoutes = "cask/resources/cask" + def staticRoutes() = "cask/resources/cask" initialize() } |