Share runBlockingTest implementation in jvmAndNative

smithy-lang · Oct 17, 2023 · 9083332 · 9083332
1 parent 4360e79
commit 9083332
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 39 deletions.
diff --git a/...ines/test-suite/jvm/src/aws/smithy/kotlin/runtime/http/test/util/AbstractEngineTestJVM.kt b/...ines/test-suite/jvm/src/aws/smithy/kotlin/runtime/http/test/util/AbstractEngineTestJVM.kt
@@ -7,30 +7,9 @@ package aws.smithy.kotlin.runtime.http.test.util
 
 import aws.smithy.kotlin.runtime.http.engine.DefaultHttpEngine
 import aws.smithy.kotlin.runtime.http.engine.crt.CrtHttpEngine
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withTimeout
-import kotlin.coroutines.CoroutineContext
-import kotlin.time.Duration
 
 internal actual fun engineFactories(): List<TestEngineFactory> =
     listOf(
         TestEngineFactory("DefaultHttpEngine", ::DefaultHttpEngine),
         TestEngineFactory("CrtHttpEngine") { CrtHttpEngine(it) },
     )
-
-internal actual fun runBlockingTest(
-    context: CoroutineContext,
-    timeout: Duration?,
-    block: suspend CoroutineScope.() -> Unit,
-) {
-    runBlocking(context) {
-        if (timeout != null) {
-            withTimeout(timeout) {
-                block()
-            }
-        } else {
-            block()
-        }
-    }
-}
diff --git a/...mAndNative/src/aws/smithy/kotlin/runtime/http/test/util/AbstractEngineTestJvmAndNative.kt b/...mAndNative/src/aws/smithy/kotlin/runtime/http/test/util/AbstractEngineTestJvmAndNative.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.http.test.util
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
+import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration
+
+internal actual fun runBlockingTest(
+    context: CoroutineContext,
+    timeout: Duration?,
+    block: suspend CoroutineScope.() -> Unit,
+) {
+    runBlocking(context) {
+        if (timeout != null) {
+            withTimeout(timeout) {
+                block()
+            }
+        } else {
+            block()
+        }
+    }
+}
diff --git a/...est-suite/native/src/aws/smithy/kotlin/runtime/http/test/util/AbstractEngineTestNative.kt b/...est-suite/native/src/aws/smithy/kotlin/runtime/http/test/util/AbstractEngineTestNative.kt
@@ -13,21 +13,4 @@ import kotlin.time.Duration
 
 // FIXME add engines to test
 internal actual fun engineFactories(): List<TestEngineFactory> =
-    listOf()
-
-// FIXME duplicated from jvm source
-internal actual fun runBlockingTest(
-    context: CoroutineContext,
-    timeout: Duration?,
-    block: suspend CoroutineScope.() -> Unit,
-) {
-    runBlocking(context) {
-        if (timeout != null) {
-            withTimeout(timeout) {
-                block()
-            }
-        } else {
-            block()
-        }
-    }
-}
+    listOf()