Skip to content

Commit b4bd1fe

Browse files
committed
Address the review
1 parent 2d9d4ac commit b4bd1fe

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

integration-testing/src/javaConsumersTest/java/RunBlockingJavaTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import kotlinx.coroutines.BuildersKt;
22
import kotlinx.coroutines.Dispatchers;
33
import org.junit.Test;
4+
import org.junit.Assert;
45

56
public class RunBlockingJavaTest {
67
Boolean entered = false;
@@ -15,6 +16,6 @@ public void testRunBlocking() {
1516
});
1617
} catch (InterruptedException e) {
1718
}
18-
assert entered;
19+
Assert.assertTrue(entered);
1920
}
2021
}

kotlinx-coroutines-core/api/kotlinx-coroutines-core.api

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ public final class kotlinx/coroutines/BuildersKt {
2727
public static synthetic fun launch$default (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
2828
public static final fun runBlocking (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
2929
public static synthetic fun runBlocking$default (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
30+
public static final fun runBlockingForKotlinOnly (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
31+
public static synthetic fun runBlockingForKotlinOnly$default (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
3032
public static final fun withContext (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
3133
}
3234

33-
public final class kotlinx/coroutines/Builders_concurrentKt {
34-
public static final fun runBlocking (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
35-
public static synthetic fun runBlocking$default (Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
36-
}
37-
3835
public abstract interface class kotlinx/coroutines/CancellableContinuation : kotlin/coroutines/Continuation {
3936
public abstract fun cancel (Ljava/lang/Throwable;)Z
4037
public abstract fun completeResume (Ljava/lang/Object;)V

kotlinx-coroutines-core/concurrent/src/Builders.concurrent.kt

+5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
@file:Suppress("LEAKED_IN_PLACE_LAMBDA", "WRONG_INVOCATION_KIND")
2+
@file:JvmMultifileClass
3+
@file:JvmName("BuildersKt")
24

35
package kotlinx.coroutines
46

57
import kotlin.contracts.ExperimentalContracts
68
import kotlin.contracts.InvocationKind
79
import kotlin.contracts.contract
810
import kotlin.coroutines.*
11+
import kotlin.jvm.JvmMultifileClass
12+
import kotlin.jvm.JvmName
913

1014
/**
1115
* Runs a new coroutine and **blocks** the current thread until its completion.
@@ -44,6 +48,7 @@ import kotlin.coroutines.*
4448
* @param block the coroutine code.
4549
*/
4650
@OptIn(ExperimentalContracts::class)
51+
@JvmName("runBlockingForKotlinOnly")
4752
public fun <T> runBlocking(
4853
context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T
4954
): T {

kotlinx-coroutines-core/jvm/test-resources/stacktraces/channels/testSendToChannel.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ Caused by: java.util.concurrent.CancellationException: Channel was cancelled
1717
at kotlinx.coroutines.BlockingCoroutine.joinBlocking(Builders.kt)
1818
at kotlinx.coroutines.BuildersKt__BuildersKt.runBlockingImpl(Builders.kt)
1919
at kotlinx.coroutines.BuildersKt.runBlockingImpl(Unknown Source)
20-
at kotlinx.coroutines.Builders_concurrentKt.runBlocking(Builders.concurrent.kt)
20+
at kotlinx.coroutines.BuildersKt__Builders_concurrentKt.runBlockingForKotlinOnly(Builders.concurrent.kt)
21+
at kotlinx.coroutines.BuildersKt.runBlockingForKotlinOnly(Unknown Source)
2122
at kotlinx.coroutines.testing.TestBase.runTest(TestBase.kt)

0 commit comments

Comments
 (0)