diff --git a/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TeamcityAdapterWithPromiseSupport.kt b/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TeamcityAdapterWithPromiseSupport.kt index 177fa056796..2309e49cc19 100644 --- a/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TeamcityAdapterWithPromiseSupport.kt +++ b/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TeamcityAdapterWithPromiseSupport.kt @@ -14,7 +14,7 @@ private external fun d8Arguments(): String @JsFun("() => (typeof process != 'undefined' && typeof process.argv != 'undefined') ? process.argv.slice(2).join(' ') : ''") private external fun nodeArguments(): String -internal fun getArguments(): List = (d8Arguments().ifEmpty { nodeArguments() }).split(' ') +internal actual fun getArguments(): List = (d8Arguments().ifEmpty { nodeArguments() }).split(' ') internal class TeamcityAdapterWithPromiseSupport : TeamcityAdapter() { private var scheduleNextTaskAfter: Promise? = null diff --git a/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TestApi.kt b/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TestApi.kt index c12ecc72668..9dc2e278d57 100644 --- a/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TestApi.kt +++ b/libraries/kotlin.test/wasm/js/src/main/kotlin/kotlin/test/TestApi.kt @@ -20,7 +20,7 @@ internal var currentAdapter: FrameworkAdapter? = null private fun isJasmine(): Boolean = js("typeof describe === 'function' && typeof it === 'function'") -internal fun adapter(): FrameworkAdapter { +internal actual fun adapter(): FrameworkAdapter { val result = currentAdapter ?: if (isJasmine()) JasmineLikeAdapter() else TeamcityAdapterWithPromiseSupport() currentAdapter = result return result diff --git a/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TeamcityAdapter.kt b/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TeamcityAdapter.kt index b961c73cb0e..243e4f228c8 100644 --- a/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TeamcityAdapter.kt +++ b/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TeamcityAdapter.kt @@ -7,6 +7,8 @@ package kotlin.test import kotlin.math.abs +internal expect fun getArguments(): List + internal open class TeamcityAdapter : FrameworkAdapter { protected open fun runOrScheduleNext(block: () -> Unit) = block() protected open fun runOrScheduleNextWithResult(block: () -> Any?) = block() diff --git a/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TestApi.kt b/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TestApi.kt index a197b42247f..7eb464beab0 100644 --- a/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TestApi.kt +++ b/libraries/kotlin.test/wasm/src/main/kotlin/kotlin/test/TestApi.kt @@ -7,6 +7,9 @@ package kotlin.test import kotlin.wasm.WasmExport + +internal expect fun adapter(): FrameworkAdapter + /** * The functions below are used by the compiler to describe the tests structure, e.g. * diff --git a/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TeamcityAdapter.kt b/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TeamcityAdapter.kt index d61e1d51b22..c32cccf1ff9 100644 --- a/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TeamcityAdapter.kt +++ b/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TeamcityAdapter.kt @@ -27,7 +27,7 @@ private external fun wasiRawArgsSizesGet( ): Int @OptIn(UnsafeWasmMemoryApi::class) -internal fun getArguments(): List = withScopedMemoryAllocator { allocator -> +internal actual fun getArguments(): List = withScopedMemoryAllocator { allocator -> val numberOfArgumentsPtr = allocator.allocate(4) val sizeOfArgumentStringPtr = allocator.allocate(4) val argNumRes = wasiRawArgsSizesGet( diff --git a/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TestApi.kt b/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TestApi.kt index 6e3f8ac1456..c9600129f37 100644 --- a/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TestApi.kt +++ b/libraries/kotlin.test/wasm/wasi/src/main/kotlin/kotlin/test/TestApi.kt @@ -7,4 +7,4 @@ package kotlin.test private val currentAdapter: FrameworkAdapter by lazy { TeamcityAdapter() } -internal fun adapter(): FrameworkAdapter = currentAdapter \ No newline at end of file +internal actual fun adapter(): FrameworkAdapter = currentAdapter \ No newline at end of file