extract websocket tests in separate module

whyoleg · whyoleg · commit 06539d0f396f · 2025-02-09T12:08:30.000+02:00
diff --git a/ktor-plugins/ktor-server-rsocket/build.gradle.kts b/ktor-plugins/ktor-server-rsocket/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,11 +32,5 @@ kotlin {
             api(projects.rsocketCore)
             api(libs.ktor.server.websockets)
         }
-        commonTest.dependencies {
-            implementation(projects.ktorClientRsocket)
-            implementation(projects.rsocketTest)
-            implementation(libs.ktor.client.cio)
-            implementation(libs.ktor.server.cio)
-        }
     }
 }
diff --git a/ktor-plugins/ktor-tests/build.gradle.kts b/ktor-plugins/ktor-tests/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,23 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.transport.ktor.websocket.server
+import rsocketbuild.*
 
-import io.ktor.client.engine.cio.CIO as ClientCIO
-import io.ktor.server.cio.CIO as ServerCIO
+plugins {
+    id("rsocketbuild.multiplatform-base")
+}
 
-class CIOWebSocketTransportTest : WebSocketTransportTest(ClientCIO, ServerCIO)
+kotlin {
+    jvmTarget()
+    nixTargets()
 
-class CIOKtorWebSocketTransportTest : KtorWebSocketTransportTest(ClientCIO, ServerCIO)
+    sourceSets {
+        commonTest.dependencies {
+            implementation(projects.ktorClientRsocket)
+            implementation(projects.ktorServerRsocket)
+            implementation(projects.rsocketTest)
+            implementation(libs.ktor.client.cio)
+            implementation(libs.ktor.server.cio)
+        }
+    }
+}
diff --git a/ktor-plugins/ktor-tests/src/commonTest/kotlin/io/rsocket/kotlin/ktor/tests/WebSocketConnectionTest.kt b/ktor-plugins/ktor-tests/src/commonTest/kotlin/io/rsocket/kotlin/ktor/tests/WebSocketConnectionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.transport.ktor.websocket.server
+package io.rsocket.kotlin.ktor.tests
 
 import io.ktor.client.*
 import io.ktor.server.application.*
diff --git a/rsocket-transports/ktor-websocket-server/build.gradle.kts b/rsocket-transports/ktor-websocket-server/build.gradle.kts
@@ -34,11 +34,5 @@ kotlin {
             api(libs.ktor.server.core)
             api(libs.ktor.server.websockets)
         }
-        commonTest.dependencies {
-            implementation(projects.rsocketTransportTests)
-            implementation(projects.rsocketTransportKtorWebsocketClient)
-            implementation(libs.ktor.client.cio)
-            implementation(libs.ktor.server.cio)
-        }
     }
 }
diff --git a/rsocket-transports/ktor-websocket-tests/build.gradle.kts b/rsocket-transports/ktor-websocket-tests/build.gradle.kts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import rsocketbuild.*
+
+plugins {
+    id("rsocketbuild.multiplatform-base")
+}
+
+kotlin {
+    jvmTarget()
+    nixTargets()
+
+    sourceSets {
+        commonTest.dependencies {
+            implementation(projects.rsocketTransportTests)
+            implementation(projects.rsocketTransportKtorWebsocketClient)
+            implementation(projects.rsocketTransportKtorWebsocketServer)
+            implementation(libs.ktor.client.cio)
+            implementation(libs.ktor.server.cio)
+        }
+    }
+}
diff --git a/rsocket-transports/ktor-websocket-tests/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/tests/WebSocketTransportTest.kt b/rsocket-transports/ktor-websocket-tests/src/commonTest/kotlin/io/rsocket/kotlin/transport/ktor/websocket/tests/WebSocketTransportTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,43 +14,38 @@
  * limitations under the License.
  */
 
-package io.rsocket.kotlin.transport.ktor.websocket.server
+package io.rsocket.kotlin.transport.ktor.websocket.tests
 
-import io.ktor.client.engine.*
-import io.ktor.server.engine.*
 import io.rsocket.kotlin.transport.ktor.websocket.client.*
+import io.rsocket.kotlin.transport.ktor.websocket.server.*
 import io.rsocket.kotlin.transport.tests.*
+import io.ktor.client.engine.cio.CIO as ClientCIO
+import io.ktor.server.cio.CIO as ServerCIO
 
 @Suppress("DEPRECATION_ERROR")
-abstract class WebSocketTransportTest(
-    private val clientEngine: HttpClientEngineFactory<*>,
-    private val serverEngine: ApplicationEngineFactory<*, *>,
-) : TransportTest() {
+class WebSocketTransportTest : TransportTest() {
     override suspend fun before() {
         val embeddedServer = startServer(
-            WebSocketServerTransport(serverEngine, port = 0)
+            WebSocketServerTransport(ServerCIO, port = 0)
         )
         val connector = embeddedServer.engine.resolvedConnectors().single()
         client = connectClient(
-            WebSocketClientTransport(clientEngine, port = connector.port, context = testContext)
+            WebSocketClientTransport(ClientCIO, port = connector.port, context = testContext)
         )
     }
 }
 
-abstract class KtorWebSocketTransportTest(
-    private val clientEngine: HttpClientEngineFactory<*>,
-    private val serverEngine: ApplicationEngineFactory<*, *>,
-) : TransportTest() {
+class KtorWebSocketTransportTest : TransportTest() {
     override suspend fun before() {
         val server = startServer(
             KtorWebSocketServerTransport(testContext) {
-                httpEngine(serverEngine)
+                httpEngine(ServerCIO)
             }.target(port = 0)
         )
         val port = server.connectors.single().port
         client = connectClient(
             KtorWebSocketClientTransport(testContext) {
-                httpEngine(clientEngine)
+                httpEngine(ClientCIO)
             }.target(port = port)
         )
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ projects("rsocket-kotlin") {
         module("ktor-websocket-internal")
         module("ktor-websocket-client")
         module("ktor-websocket-server")
+        module("ktor-websocket-tests")
 
         module("netty-internal")
         module("netty-tcp")
@@ -52,6 +53,7 @@ projects("rsocket-kotlin") {
     folder("ktor-plugins", null) {
         module("ktor-client-rsocket")
         module("ktor-server-rsocket")
+        module("ktor-tests")
         // for migration from old names
         module("rsocket-ktor-client")
         module("rsocket-ktor-server")

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015-2024 the original author or authors.`
	`2`	`+ * Copyright 2015-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -32,11 +32,5 @@ kotlin {`
`32`	`32`	`api(projects.rsocketCore)`
`33`	`33`	`api(libs.ktor.server.websockets)`
`34`	`34`	`}`
`35`		`- commonTest.dependencies {`
`36`		`- implementation(projects.ktorClientRsocket)`
`37`		`- implementation(projects.rsocketTest)`
`38`		`- implementation(libs.ktor.client.cio)`
`39`		`- implementation(libs.ktor.server.cio)`
`40`		`- }`
`41`	`35`	`}`
`42`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,5 @@ kotlin {`
`34`	`34`	`api(libs.ktor.server.core)`
`35`	`35`	`api(libs.ktor.server.websockets)`
`36`	`36`	`}`
`37`		`- commonTest.dependencies {`
`38`		`- implementation(projects.rsocketTransportTests)`
`39`		`- implementation(projects.rsocketTransportKtorWebsocketClient)`
`40`		`- implementation(libs.ktor.client.cio)`
`41`		`- implementation(libs.ktor.server.cio)`
`42`		`- }`
`43`	`37`	`}`
`44`	`38`	`}`