[routing] Fix tests

javalin · Nov 10, 2023 · 435c896 · 435c896
1 parent 03f4ace
commit 435c896
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/javalin/src/test/java/io/javalin/TestRouting.kt b/javalin/src/test/java/io/javalin/TestRouting.kt
@@ -42,11 +42,10 @@ class TestRouting {
         assertThat(http.getBody("/hello")).isEqualTo("Hello World")
     }
 
-
     @Test
     fun `routing is available in config`() = TestUtil.test(Javalin.create { cfg ->
         cfg.router.mount {
-            get("/hello") { it.result("Hello World") }
+            this.get("/hello") { it.result("Hello World") }
         }
     }) { _, http ->
         assertThat(http.getBody("/hello")).isEqualTo("Hello World")

diff --git a/javalin/src/test/java/io/javalin/TestWebSocket.kt b/javalin/src/test/java/io/javalin/TestWebSocket.kt
@@ -89,7 +89,7 @@ class TestWebSocket {
 
         TestUtil.test(contextPathJavalin { cfg ->
             cfg.router.mount {
-                ws("/test-websocket-1") { ws ->
+                this.ws("/test-websocket-1") { ws ->
                     ws.onConnect { ctx -> logger.log.add(ctx.sessionId()) }
                     ws.onClose { ctx -> logger.log.add(ctx.sessionId()) }
                 }
@@ -119,7 +119,7 @@ class TestWebSocket {
 
         TestUtil.test(contextPathJavalin { cfg ->
             cfg.router.mount {
-                ws("/test-websocket-1") { ws ->
+                this.ws("/test-websocket-1") { ws ->
                     ws.onConnect { ctx ->
                         idMap[ctx] = atomicInteger.getAndIncrement()
                         logger.log.add("${idMap[ctx]} connected")
@@ -234,7 +234,7 @@ class TestWebSocket {
     fun `headers and host are available in session`() = TestUtil.test { app, _ ->
         app.ws("/websocket") { ws ->
             ws.onConnect { ctx -> app.logger().log.add("Header: " + ctx.header("Test")!!) }
-            ws.onClose { ctx -> app.logger().log.add("Closed connection from: " + ctx.host()!!) }
+            ws.onClose { ctx -> app.logger().log.add("Closed connection from: " + ctx.host()) }
         }
         TestClient(app, "/websocket", mapOf("Test" to "HeaderParameter")).connectAndDisconnect()
         assertThat(app.logger().log).containsExactlyInAnyOrder("Header: HeaderParameter", "Closed connection from: localhost")