Updated tests to include proper coroutines debug management

Author: Mr3zee

krpc/krpc-core/build.gradle.kts

@@ -5,10 +5,6 @@
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 
-/*
- * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
- */
-
 plugins {
     alias(libs.plugins.conventions.kmp)
     alias(libs.plugins.serialization)
@@ -34,6 +30,8 @@ kotlin {
 
         commonTest {
             dependencies {
+                implementation(projects.tests.testUtils)
+
                 implementation(libs.kotlin.test)
                 implementation(libs.coroutines.test)
                 implementation(libs.serialization.json)

krpc/krpc-core/src/commonTest/kotlin/kotlinx/rpc/krpc/KrpcConnectorTest.kt

@@ -28,6 +28,7 @@ import kotlinx.rpc.krpc.internal.KrpcPlugin
 import kotlinx.rpc.krpc.internal.KrpcPluginKey
 import kotlinx.rpc.krpc.internal.KrpcProtocolMessage
 import kotlinx.rpc.krpc.internal.deserialize
+import kotlinx.rpc.test.runTestWithCoroutinesProbes
 import kotlinx.serialization.json.Json
 import kotlin.coroutines.CoroutineContext
 import kotlin.js.JsName
@@ -331,9 +332,7 @@ abstract class KrpcConnectorBaseTest {
         callTimeout: Duration = 1.seconds,
         perCallBufferSize: Int = 100,
         body: suspend TestScope.(clientConnector: KrpcConnector, serverConnector: KrpcConnector) -> Unit,
-    ) = kotlinx.coroutines.test.runTest(timeout = testTimeout) {
-        debugCoroutines()
-
+    ) = runTestWithCoroutinesProbes(timeout = testTimeout) {
         val connectorConfig = KrpcConfig.Connector(waitTimeout, callTimeout, perCallBufferSize)
 
         val transport = LocalTransport(coroutineContext)

krpc/krpc-core/src/commonTest/kotlin/kotlinx/rpc/krpc/KrpcReceiveBufferTest.kt

@@ -12,6 +12,7 @@ import kotlinx.rpc.krpc.internal.KrpcReceiveBuffer
 import kotlinx.rpc.krpc.internal.isClosed
 import kotlinx.rpc.krpc.internal.isFailure
 import kotlinx.rpc.krpc.internal.isSuccess
+import kotlinx.rpc.test.runTestWithCoroutinesProbes
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -70,9 +71,7 @@ internal abstract class KrpcReceiveBufferBaseTest {
         bufferSize: Int,
         timeout: Duration = 10.seconds,
         body: suspend TestScope.(KrpcReceiveBuffer) -> Unit,
-    ) = kotlinx.coroutines.test.runTest(timeout = timeout) {
-        debugCoroutines()
-
+    ) = runTestWithCoroutinesProbes(timeout = timeout) {
         val buffer = KrpcReceiveBuffer(
             bufferSize = { bufferSize },
         )

krpc/krpc-core/src/commonTest/kotlin/kotlinx/rpc/krpc/KrpcReceiveHandlerTest.kt

@@ -34,6 +34,7 @@ import kotlinx.rpc.krpc.internal.isFailure
 import kotlinx.rpc.krpc.internal.isSuccess
 import kotlinx.rpc.krpc.internal.onClosed
 import kotlinx.rpc.krpc.internal.onFailure
+import kotlinx.rpc.test.runTestWithCoroutinesProbes
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -232,16 +233,14 @@ internal abstract class KrpcReceiveHandlerBaseTest {
         bufferSize: Int,
         timeout: Duration = 30.seconds,
         body: suspend TestConfig.() -> Unit,
-    ) = kotlinx.coroutines.test.runTest(timeout = timeout) {
-        debugCoroutines()
-
+    ) = runTestWithCoroutinesProbes(timeout = timeout) {
         val buffer = KrpcReceiveBuffer(
             bufferSize = { bufferSize },
         )
 
         val channel = Channel<KrpcMessage>(Channel.UNLIMITED)
 
-        val senderJob = Job(this@runTest.coroutineContext.job)
+        val senderJob = Job(this@runTestWithCoroutinesProbes.coroutineContext.job)
         val sender = object : KrpcMessageSender {
             override suspend fun sendMessage(message: KrpcMessage) {
                 channel.send(message)

krpc/krpc-core/src/commonTest/kotlin/kotlinx/rpc/krpc/KrpcSendHandlerTest.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.coroutines.yield
 import kotlinx.rpc.krpc.internal.KrpcSendHandler
+import kotlinx.rpc.test.runTestWithCoroutinesProbes
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.fail
@@ -112,9 +113,7 @@ internal abstract class KrpcSendHandlerBaseTest {
     protected fun runTest(
         timeout: Duration = 10.seconds,
         body: suspend TestScope.(Channel<KrpcTransportMessage>, KrpcSendHandler) -> Unit,
-    ) = kotlinx.coroutines.test.runTest(timeout = timeout) {
-        debugCoroutines()
-
+    ) = runTestWithCoroutinesProbes(timeout = timeout) {
         val channel = Channel<KrpcTransportMessage>(
             capacity = Channel.UNLIMITED,
         )

krpc/krpc-core/src/jvmTest/kotlin/kotlinx/rpc/krpc/debug.jvm.kt

@@ -27,6 +27,7 @@ kotlin {
                 implementation(projects.krpc.krpcKtor.krpcKtorServer)
                 implementation(projects.krpc.krpcKtor.krpcKtorClient)
                 implementation(projects.krpc.krpcLogging)
+                implementation(projects.tests.testUtils)
 
                 implementation(libs.kotlin.test)
                 implementation(libs.ktor.server.netty)

krpc/krpc-ktor/krpc-ktor-core/build.gradle.kts

@@ -18,7 +18,6 @@ import io.ktor.server.routing.*
 import io.ktor.server.testing.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.debug.DebugProbes
-import kotlinx.coroutines.test.runTest
 import kotlinx.rpc.annotations.Rpc
 import kotlinx.rpc.krpc.client.KrpcClient
 import kotlinx.rpc.krpc.internal.logging.RpcInternalCommonLogger
@@ -30,6 +29,7 @@ import kotlinx.rpc.krpc.ktor.client.rpcConfig
 import kotlinx.rpc.krpc.ktor.server.Krpc
 import kotlinx.rpc.krpc.ktor.server.rpc
 import kotlinx.rpc.krpc.serialization.json.json
+import kotlinx.rpc.test.runTestWithCoroutinesProbes
 import kotlinx.rpc.withService
 import org.junit.Assert.assertEquals
 import java.net.ServerSocket
@@ -135,7 +135,7 @@ class KtorTransportTest {
     @OptIn(DelicateCoroutinesApi::class, ExperimentalCoroutinesApi::class)
     @Test
     @Ignore("Wait for Ktor fix (https://github.com/ktorio/ktor/pull/4927) or apply workaround if rejected")
-    fun testEndpointsTerminateWhenWsDoes() = runTest(timeout = 15.seconds) {
+    fun testEndpointsTerminateWhenWsDoes() = runTestWithCoroutinesProbes(timeout = 15.seconds) {
         DebugProbes.install()
 
         val logger = setupLogger()

krpc/krpc-ktor/krpc-ktor-core/src/jvmTest/kotlin/kotlinx/rpc/krpc/ktor/KtorTransportTest.kt

@@ -37,6 +37,8 @@ kotlin {
                 api(projects.krpc.krpcClient)
                 api(projects.krpc.krpcLogging)
 
+                implementation(projects.tests.testUtils)
+
                 implementation(projects.krpc.krpcSerialization.krpcSerializationJson)
 
                 implementation(libs.serialization.core)

krpc/krpc-test/build.gradle.kts

@@ -6,6 +6,7 @@ package kotlinx.rpc.krpc.test
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
+import kotlinx.rpc.test.runThreadIfPossible
 import kotlinx.serialization.Serializable
 import kotlin.coroutines.resumeWithException
 import kotlin.test.assertContentEquals
@@ -267,7 +268,3 @@ class KrpcTestServiceBackend : KrpcTestService {
         }
     }
 }
-
-internal expect fun runThreadIfPossible(runner: () -> Unit)
-
-internal expect fun debugCoroutines()