franklinblanco/kotlin-result
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make runBlockingTest match signature of kotlinx-coroutines-test

Browse Source
This commit is contained in:
Michael Bull 2020-08-26 19:26:02 +01:00
parent a76768fa42
commit b123921ba5
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin-result-coroutines/src/commonMain/kotlin/com/github/michaelbull/result/coroutines/binding/SuspendableBinding.kt
View File

@ -43,7 +43,7 @@ internal class SuspendableResultBindingImpl<E> : SuspendableResultBinding<E> {
is Ok -> value is Ok -> value
is Err -> { is Err -> {
mutex.withLock { mutex.withLock {
if (::internalError.isInitialized.not()){ if (::internalError.isInitialized.not()) {
internalError = this internalError = this
} }
} }

7
kotlin-result-coroutines/src/commonTest/kotlin/com.github.michaelbull.result.coroutines/RunBlockingTest.kt
View File

@ -1,9 +1,14 @@
package com.github.michaelbull.result.coroutines package com.github.michaelbull.result.coroutines
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.EmptyCoroutineContext
/** /**
* Workaround to use suspending functions in unit tests for multiplatform/native projects. * Workaround to use suspending functions in unit tests for multiplatform/native projects.
* Solution was found here: https://github.com/Kotlin/kotlinx.coroutines/issues/885#issuecomment-446586161 * Solution was found here: https://github.com/Kotlin/kotlinx.coroutines/issues/885#issuecomment-446586161
*/ */
expect fun runBlockingTest(block: suspend (scope : CoroutineScope) -> Unit) expect fun runBlockingTest(
context: CoroutineContext = EmptyCoroutineContext,
testBody: suspend CoroutineScope.() -> Unit
)

7
kotlin-result-coroutines/src/jvmTest/kotlin/com/github/michaelbull/result/coroutines/RunBlockingTest.kt
View File

@ -2,5 +2,10 @@ package com.github.michaelbull.result.coroutines
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlin.coroutines.CoroutineContext
actual fun runBlockingTest(block: suspend (scope : CoroutineScope) -> Unit) = runBlocking { block(this) } actual fun runBlockingTest(context: CoroutineContext, testBody: suspend CoroutineScope.() -> Unit) {
runBlocking {
testBody(this)
}
}