diff --git a/example/compress/app/test/src/ExampleTests.scala b/example/compress/app/test/src/ExampleTests.scala index 68c249f1ca..6e5672645e 100644 --- a/example/compress/app/test/src/ExampleTests.scala +++ b/example/compress/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/compress2/app/test/src/ExampleTests.scala b/example/compress2/app/test/src/ExampleTests.scala index fdfedda1c2..d900529be3 100644 --- a/example/compress2/app/test/src/ExampleTests.scala +++ b/example/compress2/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/compress3/app/test/src/ExampleTests.scala b/example/compress3/app/test/src/ExampleTests.scala index 2bd8b31cbe..59279559d2 100644 --- a/example/compress3/app/test/src/ExampleTests.scala +++ b/example/compress3/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/cookies/app/test/src/ExampleTests.scala b/example/cookies/app/test/src/ExampleTests.scala index ea5251f429..55c51459c2 100644 --- a/example/cookies/app/test/src/ExampleTests.scala +++ b/example/cookies/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/decorated/app/test/src/ExampleTests.scala b/example/decorated/app/test/src/ExampleTests.scala index fe8759a2a1..65379ce4aa 100644 --- a/example/decorated/app/test/src/ExampleTests.scala +++ b/example/decorated/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/decorated2/app/test/src/ExampleTests.scala b/example/decorated2/app/test/src/ExampleTests.scala index 624b86d93f..b431f45007 100644 --- a/example/decorated2/app/test/src/ExampleTests.scala +++ b/example/decorated2/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/endpoints/app/test/src/ExampleTests.scala b/example/endpoints/app/test/src/ExampleTests.scala index 843ff54b35..6b0ce38899 100644 --- a/example/endpoints/app/test/src/ExampleTests.scala +++ b/example/endpoints/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/formJsonPost/app/test/src/ExampleTests.scala b/example/formJsonPost/app/test/src/ExampleTests.scala index a26c2ec7ee..07ab77c482 100644 --- a/example/formJsonPost/app/test/src/ExampleTests.scala +++ b/example/formJsonPost/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/httpMethods/app/test/src/ExampleTests.scala b/example/httpMethods/app/test/src/ExampleTests.scala index 9e97d89018..ac198bf05c 100644 --- a/example/httpMethods/app/test/src/ExampleTests.scala +++ b/example/httpMethods/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/minimalApplication/app/test/src/ExampleTests.scala b/example/minimalApplication/app/test/src/ExampleTests.scala index 2592b93985..986fc617b3 100644 --- a/example/minimalApplication/app/test/src/ExampleTests.scala +++ b/example/minimalApplication/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/minimalApplication2/app/test/src/ExampleTests.scala b/example/minimalApplication2/app/test/src/ExampleTests.scala index d68054913d..5bbee09e9f 100644 --- a/example/minimalApplication2/app/test/src/ExampleTests.scala +++ b/example/minimalApplication2/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/redirectAbort/app/test/src/ExampleTests.scala b/example/redirectAbort/app/test/src/ExampleTests.scala index 44ef9f9c52..6f1642ce6b 100644 --- a/example/redirectAbort/app/test/src/ExampleTests.scala +++ b/example/redirectAbort/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/scalatags/app/test/src/ExampleTests.scala b/example/scalatags/app/test/src/ExampleTests.scala index d4dfbb31f9..4c4f9c80e8 100644 --- a/example/scalatags/app/test/src/ExampleTests.scala +++ b/example/scalatags/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/staticFiles/app/test/src/ExampleTests.scala b/example/staticFiles/app/test/src/ExampleTests.scala index 2bd6024194..7601dfe3f0 100644 --- a/example/staticFiles/app/test/src/ExampleTests.scala +++ b/example/staticFiles/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/staticFiles2/app/test/src/ExampleTests.scala b/example/staticFiles2/app/test/src/ExampleTests.scala index 78d363d167..94e7dbce6b 100644 --- a/example/staticFiles2/app/test/src/ExampleTests.scala +++ b/example/staticFiles2/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/todo/app/test/src/ExampleTests.scala b/example/todo/app/test/src/ExampleTests.scala index 0c39c87f8c..411974ba8c 100644 --- a/example/todo/app/test/src/ExampleTests.scala +++ b/example/todo/app/test/src/ExampleTests.scala @@ -3,12 +3,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = io.undertow.Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/todoApi/app/test/src/ExampleTests.scala b/example/todoApi/app/test/src/ExampleTests.scala index f65f083b3c..f150504de1 100644 --- a/example/todoApi/app/test/src/ExampleTests.scala +++ b/example/todoApi/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/todoDb/app/test/src/ExampleTests.scala b/example/todoDb/app/test/src/ExampleTests.scala index 263ad9dc92..f6c0d98e9e 100644 --- a/example/todoDb/app/test/src/ExampleTests.scala +++ b/example/todoDb/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/twirl/app/test/src/ExampleTests.scala b/example/twirl/app/test/src/ExampleTests.scala index 0dcc120453..032dd8bfb8 100644 --- a/example/twirl/app/test/src/ExampleTests.scala +++ b/example/twirl/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/variableRoutes/app/test/src/ExampleTests.scala b/example/variableRoutes/app/test/src/ExampleTests.scala index 3592f95355..731a270613 100644 --- a/example/variableRoutes/app/test/src/ExampleTests.scala +++ b/example/variableRoutes/app/test/src/ExampleTests.scala @@ -6,12 +6,12 @@ import utest._ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } diff --git a/example/websockets/app/test/src/ExampleTests.scala b/example/websockets/app/test/src/ExampleTests.scala index 14a66c4006..705fbb29e3 100644 --- a/example/websockets/app/test/src/ExampleTests.scala +++ b/example/websockets/app/test/src/ExampleTests.scala @@ -12,12 +12,12 @@ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = io.undertow.Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } @@ -26,7 +26,7 @@ object ExampleTests extends TestSuite{ @volatile var out = List.empty[String] // 4. open websocket - val ws = cask.WsClient.connect("ws://localhost:8080/connect/haoyi"){ + val ws = cask.WsClient.connect("ws://localhost:8081/connect/haoyi"){ case cask.Ws.Text(s) => out = s :: out } @@ -39,7 +39,7 @@ object ExampleTests extends TestSuite{ out ==> List("haoyi world", "haoyi hello") val ex = intercept[Exception] { - cask.WsClient.connect("ws://localhost:8080/connect/nobody") { + cask.WsClient.connect("ws://localhost:8081/connect/nobody") { case _ => /*do nothing*/ } } @@ -52,7 +52,7 @@ object ExampleTests extends TestSuite{ @volatile var out = List.empty[String] val closed = new AtomicInteger(0) val client = org.asynchttpclient.Dsl.asyncHttpClient(); - val ws = Seq.fill(2000)(client.prepareGet("ws://localhost:8080/connect/haoyi") + val ws = Seq.fill(2000)(client.prepareGet("ws://localhost:8081/connect/haoyi") .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener( new WebSocketListener() { diff --git a/example/websockets2/app/test/src/ExampleTests.scala b/example/websockets2/app/test/src/ExampleTests.scala index c3707aef5e..76336d8fcc 100644 --- a/example/websockets2/app/test/src/ExampleTests.scala +++ b/example/websockets2/app/test/src/ExampleTests.scala @@ -10,12 +10,12 @@ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = io.undertow.Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } @@ -24,7 +24,7 @@ object ExampleTests extends TestSuite{ test("Websockets") - withServer(Websockets2){ host => @volatile var out = List.empty[String] // 4. open websocket - val ws = cask.WsClient.connect("ws://localhost:8080/connect/haoyi"){ + val ws = cask.WsClient.connect("ws://localhost:8081/connect/haoyi"){ case cask.Ws.Text(s) => out = s :: out } @@ -37,7 +37,7 @@ object ExampleTests extends TestSuite{ out ==> List("haoyi world", "haoyi hello") val ex = intercept[Exception]( - cask.WsClient.connect("ws://localhost:8080/connect/nobody") { + cask.WsClient.connect("ws://localhost:8081/connect/nobody") { case _ => /*do nothing*/ } ) @@ -49,7 +49,7 @@ object ExampleTests extends TestSuite{ @volatile var out = List.empty[String] val closed = new AtomicInteger(0) val client = org.asynchttpclient.Dsl.asyncHttpClient(); - val ws = Seq.fill(2000)(client.prepareGet("ws://localhost:8080/connect/haoyi") + val ws = Seq.fill(2000)(client.prepareGet("ws://localhost:8081/connect/haoyi") .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener( new WebSocketListener() { diff --git a/example/websockets3/app/test/src/ExampleTests.scala b/example/websockets3/app/test/src/ExampleTests.scala index 5c7515a8a9..ef2281860e 100644 --- a/example/websockets3/app/test/src/ExampleTests.scala +++ b/example/websockets3/app/test/src/ExampleTests.scala @@ -9,12 +9,12 @@ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = io.undertow.Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } @@ -23,7 +23,7 @@ object ExampleTests extends TestSuite{ test("Websockets") - withServer(Websockets3Main){ host => @volatile var out = List.empty[String] // 4. open websocket - val ws = cask.WsClient.connect("ws://localhost:8080/connect/haoyi"){ + val ws = cask.WsClient.connect("ws://localhost:8081/connect/haoyi"){ case cask.Ws.Text(s) => out = s :: out } @@ -36,7 +36,7 @@ object ExampleTests extends TestSuite{ out ==> List("haoyi world", "haoyi hello") val ex = intercept[Exception]( - cask.WsClient.connect("ws://localhost:8080/connect/nobody") { + cask.WsClient.connect("ws://localhost:8081/connect/nobody") { case _ => /*do nothing*/ } ) diff --git a/example/websockets4/app/test/src/ExampleTests.scala b/example/websockets4/app/test/src/ExampleTests.scala index 57b0519cc0..5bbcd2294d 100644 --- a/example/websockets4/app/test/src/ExampleTests.scala +++ b/example/websockets4/app/test/src/ExampleTests.scala @@ -8,12 +8,12 @@ object ExampleTests extends TestSuite{ def withServer[T](example: cask.main.Main)(f: String => T): T = { val server = io.undertow.Undertow.builder - .addHttpListener(8080, "localhost") + .addHttpListener(8081, "localhost") .setHandler(example.defaultHandler) .build server.start() val res = - try f("http://localhost:8080") + try f("http://localhost:8081") finally server.stop() res } @@ -22,7 +22,7 @@ object ExampleTests extends TestSuite{ test("Websockets") - withServer(Websockets4Main){ host => @volatile var out = List.empty[String] // 4. open websocket - val ws = cask.WsClient.connect("ws://localhost:8080/connect/haoyi"){ + val ws = cask.WsClient.connect("ws://localhost:8081/connect/haoyi"){ case cask.Ws.Text(s) => out = s :: out } @@ -35,7 +35,7 @@ object ExampleTests extends TestSuite{ out ==> List("haoyi world", "haoyi hello") val ex = intercept[Exception]( - cask.WsClient.connect("ws://localhost:8080/connect/nobody") { + cask.WsClient.connect("ws://localhost:8081/connect/nobody") { case _ => /*do nothing*/ } )