summaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-08-13 15:00:14 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-08-13 15:25:11 +0800
commita873d77fbeb4590dceeb893ab067beb9058db241 (patch)
tree3132f93c3f78206ad3ca7af8dd7f04a116c216ed /example
parent3ff5a5079080de524375cd43425c1515bf128274 (diff)
downloadcask-a873d77fbeb4590dceeb893ab067beb9058db241.tar.gz
cask-a873d77fbeb4590dceeb893ab067beb9058db241.tar.bz2
cask-a873d77fbeb4590dceeb893ab067beb9058db241.zip
Tweak websocket tests, example and docs
Diffstat (limited to 'example')
-rw-r--r--example/endpoints/app/src/Endpoints.scala6
-rw-r--r--example/websockets/app/src/Websockets.scala8
-rw-r--r--example/websockets/app/test/src/ExampleTests.scala2
3 files changed, 6 insertions, 10 deletions
diff --git a/example/endpoints/app/src/Endpoints.scala b/example/endpoints/app/src/Endpoints.scala
index 9eadf39..5450029 100644
--- a/example/endpoints/app/src/Endpoints.scala
+++ b/example/endpoints/app/src/Endpoints.scala
@@ -1,10 +1,6 @@
package app
-import cask.main.HttpDecorator
-import cask.model.ParamContext
-
-
-class custom(val path: String, val methods: Seq[String]) extends cask.Endpoint with HttpDecorator{
+class custom(val path: String, val methods: Seq[String]) extends cask.Endpoint{
type Output = Int
def wrapFunction(ctx: cask.ParamContext, delegate: Delegate): Returned = {
delegate(Map()).map{num =>
diff --git a/example/websockets/app/src/Websockets.scala b/example/websockets/app/src/Websockets.scala
index 277b06f..a6ceb73 100644
--- a/example/websockets/app/src/Websockets.scala
+++ b/example/websockets/app/src/Websockets.scala
@@ -13,14 +13,14 @@ object Websockets extends cask.MainRoutes{
channel.getReceiveSetter.set(
new AbstractReceiveListener() {
override def onFullTextMessage(channel: WebSocketChannel, message: BufferedTextMessage) = {
- val data = message.getData
- if (data == "") channel.close()
- else WebSockets.sendTextBlocking(userName + " " + data, channel)
+ message.getData match{
+ case "" => channel.close()
+ case data => WebSockets.sendTextBlocking(userName + " " + data, channel)
+ }
}
}
)
channel.resumeReceives()
-
}
}
}
diff --git a/example/websockets/app/test/src/ExampleTests.scala b/example/websockets/app/test/src/ExampleTests.scala
index 403fde0..969750c 100644
--- a/example/websockets/app/test/src/ExampleTests.scala
+++ b/example/websockets/app/test/src/ExampleTests.scala
@@ -105,7 +105,7 @@ object ExampleTests extends TestSuite{
w.sendTextFrame("")
Thread.sleep(1)
}
- Thread.sleep(1500)
+ Thread.sleep(2000)
out.length ==> 2000
}finally{