From 2821c357a16f9c8f44ead85f19fe82e1669c5429 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 5 Sep 2018 16:05:28 +0300 Subject: [PATCH] Switch coroutine tests to release coroutines --- libraries/stdlib/jdk7/build.gradle | 2 +- libraries/stdlib/jdk8/build.gradle | 2 +- libraries/stdlib/jre7/build.gradle | 2 +- libraries/stdlib/jre8/build.gradle | 2 +- libraries/stdlib/js/build.gradle | 2 +- libraries/stdlib/jvm/build.gradle | 2 +- .../stdlib/test/coroutines/CoroutineContextTest.kt | 2 +- .../test/coroutines/CoroutinesReferenceValuesTest.kt | 10 +++------- .../stdlib/test/coroutines/SequenceBuilderTest.kt | 2 -- 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 95b198648f0..36f4ff3f8f7 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -70,7 +70,7 @@ compileKotlin { } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] + kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] } compileJava9Sources(project, 'kotlin.stdlib.jdk7') diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 8820b8fe889..bf2d832d795 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -73,7 +73,7 @@ compileKotlin { } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] + kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] } compileJava9Sources(project, 'kotlin.stdlib.jdk8') diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle index f892c499e2f..92389a61fe7 100644 --- a/libraries/stdlib/jre7/build.gradle +++ b/libraries/stdlib/jre7/build.gradle @@ -68,7 +68,7 @@ compileKotlin { } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] + kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform", "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] } kotlin.experimental.coroutines 'enable' diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle index fc1a1f6a67b..e6a9b0afec3 100644 --- a/libraries/stdlib/jre8/build.gradle +++ b/libraries/stdlib/jre8/build.gradle @@ -71,7 +71,7 @@ compileKotlin { } compileTestKotlin { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform", "-XXLanguage:-ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] + kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform", "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"] } kotlin.experimental.coroutines 'enable' diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle index 2356b9473a5..b773ae84b62 100644 --- a/libraries/stdlib/js/build.gradle +++ b/libraries/stdlib/js/build.gradle @@ -189,7 +189,7 @@ compileTestKotlin2Js { kotlinOptions { moduleKind = "umd" freeCompilerArgs += [ - "-XXLanguage:-ReleaseCoroutines", + "-XXLanguage:+ReleaseCoroutines", "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes" ] } diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 9f7e2385694..20c16b6020e 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -257,7 +257,7 @@ compileTestKotlin { kotlinOptions { freeCompilerArgs += [ "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes", - "-XXLanguage:-ReleaseCoroutines" + "-XXLanguage:+ReleaseCoroutines" ] } } diff --git a/libraries/stdlib/test/coroutines/CoroutineContextTest.kt b/libraries/stdlib/test/coroutines/CoroutineContextTest.kt index 7236fd2cb3a..5d31464edfe 100644 --- a/libraries/stdlib/test/coroutines/CoroutineContextTest.kt +++ b/libraries/stdlib/test/coroutines/CoroutineContextTest.kt @@ -6,7 +6,7 @@ package test.coroutines import kotlin.test.* -import kotlin.coroutines.experimental.* +import kotlin.coroutines.* class CoroutineContextTest { data class CtxA(val i: Int) : AbstractCoroutineContextElement(CtxA) { diff --git a/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt b/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt index 4c233491a7c..35d10562495 100644 --- a/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt +++ b/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt @@ -7,7 +7,7 @@ package test.coroutines import test.assertStaticAndRuntimeTypeIs import kotlin.test.* -import kotlin.coroutines.experimental.* +import kotlin.coroutines.* /** * Test to ensure that coroutine machinery does not call equals/hashCode/toString anywhere. @@ -45,13 +45,9 @@ class CoroutinesReferenceValuesTest { bad.startCoroutine(object : Continuation { override val context: CoroutineContext = EmptyCoroutineContext - override fun resume(value: BadClass) { + override fun resumeWith(result_: SuccessOrFailure) { assertTrue(result == null) - result = value - } - - override fun resumeWithException(exception: Throwable) { - throw exception + result = result_.getOrThrow() } }) assertTrue(result is BadClass) diff --git a/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt b/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt index 7d8cbc440be..3ee321b8eed 100644 --- a/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt +++ b/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt @@ -6,8 +6,6 @@ package test.coroutines import kotlin.test.* -import kotlin.coroutines.experimental.buildSequence -import kotlin.coroutines.experimental.buildIterator class SequenceBuilderTest { @Test