diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-09-16 22:48:00 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-09-16 22:48:00 +0800 |
commit | 6dd98a826245cd1551908727eddf99804d075968 (patch) | |
tree | 20a90277d274132110794a1bd4c87c13a8fd9dc9 /example | |
parent | d22a0e75bded29a28529b87ed5ef9db2f6ae86c9 (diff) | |
download | cask-6dd98a826245cd1551908727eddf99804d075968.tar.gz cask-6dd98a826245cd1551908727eddf99804d075968.tar.bz2 cask-6dd98a826245cd1551908727eddf99804d075968.zip |
fix-tests
Diffstat (limited to 'example')
-rw-r--r-- | example/websockets3/app/src/Websockets3.scala | 6 | ||||
-rw-r--r-- | example/websockets3/app/test/src/ExampleTests.scala | 56 |
2 files changed, 19 insertions, 43 deletions
diff --git a/example/websockets3/app/src/Websockets3.scala b/example/websockets3/app/src/Websockets3.scala index 8368e0d..030c924 100644 --- a/example/websockets3/app/src/Websockets3.scala +++ b/example/websockets3/app/src/Websockets3.scala @@ -6,9 +6,9 @@ case class Websockets3()(implicit val log: cask.Logger) extends cask.Routes{ if (userName != "haoyi") cask.Response("", statusCode = 403) else cask.WsHandler { channel => cask.WsActor { - case cask.WsActor.Text("") => channel.send(cask.WsActor.Close()) - case cask.WsActor.Text(data) => - channel.send(cask.WsActor.Text(userName + " " + data)) + case cask.Ws.Text("") => channel.send(cask.Ws.Close()) + case cask.Ws.Text(data) => + channel.send(cask.Ws.Text(userName + " " + data)) } } } diff --git a/example/websockets3/app/test/src/ExampleTests.scala b/example/websockets3/app/test/src/ExampleTests.scala index a595c4c..868194e 100644 --- a/example/websockets3/app/test/src/ExampleTests.scala +++ b/example/websockets3/app/test/src/ExampleTests.scala @@ -4,7 +4,8 @@ import java.util.concurrent.atomic.AtomicInteger import org.asynchttpclient.ws.{WebSocket, WebSocketListener, WebSocketUpgradeHandler} import utest._ - +import concurrent.ExecutionContext.Implicits.global +import cask.Logger.Console.globalLogger object ExampleTests extends TestSuite{ @@ -23,53 +24,28 @@ object ExampleTests extends TestSuite{ val tests = Tests{ test("Websockets") - withServer(Websockets3Main){ host => @volatile var out = List.empty[String] - val client = org.asynchttpclient.Dsl.asyncHttpClient(); - try{ - - // 4. open websocket - val ws: WebSocket = client.prepareGet("ws://localhost:8080/connect/haoyi") - .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener( - new WebSocketListener() { - - override def onTextFrame(payload: String, finalFragment: Boolean, rsv: Int) { - out = payload :: out - } - - def onOpen(websocket: WebSocket) = () - - def onClose(websocket: WebSocket, code: Int, reason: String) = () - - def onError(t: Throwable) = () - }).build() - ).get() + // 4. open websocket + val ws = cask.WsClient.connect("ws://localhost:8080/connect/haoyi"){ + case cask.Ws.Text(s) => out = s :: out + } + try { // 5. send messages - ws.sendTextFrame("hello") - ws.sendTextFrame("world") - ws.sendTextFrame("") + ws.send(cask.Ws.Text("hello")) + ws.send(cask.Ws.Text("world")) + ws.send(cask.Ws.Text("")) Thread.sleep(100) out ==> List("haoyi world", "haoyi hello") var error: String = "" - val cli2 = client.prepareGet("ws://localhost:8080/connect/nobody") - .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener( - new WebSocketListener() { - - def onOpen(websocket: WebSocket) = () - - def onClose(websocket: WebSocket, code: Int, reason: String) = () - - def onError(t: Throwable) = { - error = t.toString - } - }).build() - ).get() + val ws2 = cask.WsClient.connect("ws://localhost:8080/connect/nobody") { + case cask.Ws.Text(s) => out = s :: out + case cask.Ws.Error(t) => error += t.toString + case cask.Ws.Close(code, reason) => error += reason + } assert(error.contains("403")) - - } finally{ - client.close() - } + }finally ws.close() } } } |