Actual workaround for missing suspend tests (see KT-22228)

Author: elizarov

common/kotlinx-coroutines-core-common/src/test/kotlin/kotlinx/coroutines/experimental/CommonTestBase.kt

@@ -31,5 +31,9 @@ public expect open class TestBase constructor() {
         expected: ((Throwable) -> Boolean)? = null,
         unhandled: List<(Throwable) -> Boolean> = emptyList(),
         block: suspend CoroutineScope.() -> Unit
-    )
+    ): TestResult
 }
+
+// todo: This is a work-around for missing suspend tests, see KT-22228
+@Suppress("NO_ACTUAL_FOR_EXPECT")
+expect class TestResult

core/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/TestBase.kt

@@ -117,6 +117,7 @@ public actual open class TestBase actual constructor() {
         checkTestThreads(threadsBefore)
     }
 
+    @Suppress("ACTUAL_WITHOUT_EXPECT")
     public actual fun runTest(
         expected: ((Throwable) -> Boolean)? = null,
         unhandled: List<(Throwable) -> Boolean> = emptyList(),
@@ -147,4 +148,7 @@ public actual open class TestBase actual constructor() {
         if (exCount < unhandled.size)
             error("Too few unhandled exceptions $exCount, expected ${unhandled.size}")
     }
-}
+}
+
+@Suppress("ACTUAL_WITHOUT_EXPECT")
+actual typealias TestResult = Unit

js/kotlinx-coroutines-core-js/src/test/kotlin/kotlinx/coroutines/experimental/TestBase.kt

@@ -65,10 +65,10 @@ public actual open class TestBase actual constructor() {
         expected: ((Throwable) -> Boolean)? = null,
         unhandled: List<(Throwable) -> Boolean> = emptyList(),
         block: suspend CoroutineScope.() -> Unit
-    ) {
+    ): TestResult {
         var exCount = 0
         var ex: Throwable? = null
-        val promise = promise(block = block, context = CoroutineExceptionHandler { context, e ->
+        return promise(block = block, context = CoroutineExceptionHandler { context, e ->
             if (e is CancellationException) return@CoroutineExceptionHandler // are ignored
             exCount++
             if (exCount > unhandled.size)
@@ -90,11 +90,12 @@ public actual open class TestBase actual constructor() {
             error?.let { throw it }
             check(actionIndex == 0 || finished) { "Expecting that 'finish(...)' was invoked, but it was not" }
         }
-        // todo: This is a work-around for missing suspend tests, see KT-22228
-        @Suppress("UnsafeCastFromDynamic")
-        return promise.asDynamic()
     }
 }
 
 private fun <T> Promise<T>.finally(block: () -> Unit): Promise<T> =
     then(onFulfilled = { value -> block(); value }, onRejected = { ex -> block(); throw ex })
+
+// todo: This is a work-around for missing suspend tests, see KT-22228
+@Suppress("ACTUAL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE", "ACTUAL_WITHOUT_EXPECT")
+actual typealias TestResult = Promise<Any?>