Merge branch '6.0.x'

This commit is contained in:
Sébastien Deleuze
2023-06-23 14:20:13 +02:00
8 changed files with 42 additions and 47 deletions

View File

@@ -34,7 +34,7 @@ class KotlinCoroutinesUtilsTests {
fun deferredToMono() {
runBlocking {
val deferred: Deferred<String> = async(Dispatchers.IO) {
delay(10)
delay(1)
"foo"
}
val mono = CoroutinesUtils.deferredToMono(deferred)
@@ -122,12 +122,12 @@ class KotlinCoroutinesUtilsTests {
}
suspend fun suspendingFunction(value: String): String {
delay(10)
delay(1)
return value
}
suspend fun suspendingFunctionWithFlow(): Flow<String> {
delay(10)
delay(1)
return flowOf("foo", "bar")
}
@@ -136,7 +136,7 @@ class KotlinCoroutinesUtilsTests {
}
suspend fun suspendingFunctionWithContext(value: String): String {
delay(10)
delay(1)
Assertions.assertThat(coroutineContext[CoroutineName]?.name).isEqualTo("name")
return value
}