diff --git a/build.gradle.kts b/build.gradle.kts index eea36b46642..86c78e748dc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ import proguard.gradle.ProGuardTask buildscript { extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT" - kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.50-dev-310", onlySuccessBootstrap = false)) + kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.50-dev-697", onlySuccessBootstrap = false)) val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString() diff --git a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt index cfe5bee1565..0eceb52962f 100644 --- a/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt +++ b/compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt @@ -1,8 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST + import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt b/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt index 5fa1cbfede4..4365842d198 100644 --- a/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere( diff --git a/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt b/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt index 038df73732d..d4849574e62 100644 --- a/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/accessorForSuspend.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/asyncIterator.kt b/compiler/testData/codegen/box/coroutines/asyncIterator.kt index 3207face102..978449fea83 100644 --- a/compiler/testData/codegen/box/coroutines/asyncIterator.kt +++ b/compiler/testData/codegen/box/coroutines/asyncIterator.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* interface AsyncGenerator { suspend fun yield(value: T) diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt index 19dd1927514..04df9ca882f 100644 --- a/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt +++ b/compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* interface AsyncGenerator { suspend fun yield(value: T) diff --git a/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt b/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt index 45baabe6c78..ebbb9bc6fb9 100644 --- a/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt +++ b/compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* interface AsyncGenerator { suspend fun yield(value: T) diff --git a/compiler/testData/codegen/box/coroutines/await.kt b/compiler/testData/codegen/box/coroutines/await.kt index 307f949209a..b88d6ce4c99 100644 --- a/compiler/testData/codegen/box/coroutines/await.kt +++ b/compiler/testData/codegen/box/coroutines/await.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // FILE: promise.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Promise(private val executor: ((T) -> Unit) -> Unit) { private var value: Any? = null @@ -51,8 +52,8 @@ fun processQueue() { // FILE: await.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* private var log = "" @@ -97,8 +98,8 @@ fun asyncOperation(resultSupplier: () -> T) = Promise { resolve -> fun getLog() = log // FILE: main.kt -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* private fun test() = async { val o = await(asyncOperation { "O" }) diff --git a/compiler/testData/codegen/box/coroutines/beginWithException.kt b/compiler/testData/codegen/box/coroutines/beginWithException.kt index 5f5b878833e..474f0382745 100644 --- a/compiler/testData/codegen/box/coroutines/beginWithException.kt +++ b/compiler/testData/codegen/box/coroutines/beginWithException.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): Any = suspendCoroutineOrReturn { x -> } diff --git a/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt b/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt index faf89dc6cae..ef848237bf8 100644 --- a/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt +++ b/compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): Any = suspendCoroutineOrReturn { x ->} fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/box/coroutines/coercionToUnit.kt b/compiler/testData/codegen/box/coroutines/coercionToUnit.kt index b3d416e8776..5b94f1b58d6 100644 --- a/compiler/testData/codegen/box/coroutines/coercionToUnit.kt +++ b/compiler/testData/codegen/box/coroutines/coercionToUnit.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun await(t: T): T = suspendCoroutineOrReturn { c -> diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt index 272d02615f1..3dfd0b06cb9 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt index 7898ff7785f..531fdf9cb16 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt index 452919efa28..07a5484d878 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt index 1f2f0fe1544..9ef8acf5268 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt index 4ed50a3a673..5ae7ec759e9 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt b/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt index 43279828a11..733a0b5be1e 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt index 3cebc02ee03..3d188c18e34 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt b/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt index 30f5cd8c1d7..6bbc330d9d7 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit): Unit { c.startCoroutine(handleResultContinuation { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt b/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt index 8d2efbbd2e3..293eb1ffafd 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt b/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt index ab9a7bbeeb5..98b44de64a6 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt index 3b58b756534..5ac6687f2bf 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt index 0ed5739fa11..f8f6116fc75 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt b/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt index 4debc5952c4..08545a5551d 100644 --- a/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt +++ b/compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt @@ -1,8 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.Continuation +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt b/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt index 5b9aeb1adb1..eebb381c5f4 100644 --- a/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt +++ b/compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var result = false diff --git a/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt b/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt index 604fad91b0b..8c018988501 100644 --- a/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt +++ b/compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt @@ -1,7 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* inline fun inlinedLambda(block: () -> Unit) { return block() diff --git a/compiler/testData/codegen/box/coroutines/coroutineToString.kt b/compiler/testData/codegen/box/coroutines/coroutineToString.kt index fd02bebdc86..1de0f89673e 100644 --- a/compiler/testData/codegen/box/coroutines/coroutineToString.kt +++ b/compiler/testData/codegen/box/coroutines/coroutineToString.kt @@ -1,10 +1,11 @@ // TARGET_BACKEND: JVM // WITH_REFLECT // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class A { suspend fun foo() {} @@ -29,5 +30,5 @@ fun box(): String { result = A().bar() } - return if (result == "(kotlin.coroutines.experimental.Continuation) -> kotlin.Any?") "OK" else "Fail: $result" + return if (result == "(COROUTINES_PACKAGE.Continuation) -> kotlin.Any?") "OK" else "Fail: $result" } diff --git a/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt b/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt index daed63fe077..8da10cbc5aa 100644 --- a/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt +++ b/compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { val x = c.createCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt index 1834496d4ad..e4f144dab42 100644 --- a/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt +++ b/compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt @@ -1,7 +1,8 @@ // WITH_RUNTIME // IGNORE_BACKEND: JS -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED fun runCustomLambdaAsCoroutine(e: Throwable? = null, x: (Continuation) -> Any?): String { var result = "fail" diff --git a/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt b/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt index 49b56ab976d..696342a64a4 100644 --- a/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt +++ b/compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* interface Consumer { fun consume(s: String) } diff --git a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt index 1337341d73b..b5fe2a9bf33 100644 --- a/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(a: String = "abc", i: Int = 2): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/dispatchResume.kt b/compiler/testData/codegen/box/coroutines/dispatchResume.kt index 4e3eb06ff79..5fa6fc8d1d8 100644 --- a/compiler/testData/codegen/box/coroutines/dispatchResume.kt +++ b/compiler/testData/codegen/box/coroutines/dispatchResume.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var log = "" diff --git a/compiler/testData/codegen/box/coroutines/emptyClosure.kt b/compiler/testData/codegen/box/coroutines/emptyClosure.kt index 24e96520a4f..e91a2eb8695 100644 --- a/compiler/testData/codegen/box/coroutines/emptyClosure.kt +++ b/compiler/testData/codegen/box/coroutines/emptyClosure.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var result = 0 diff --git a/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt b/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt index da69fb244b4..c1c0995b841 100644 --- a/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt +++ b/compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(v: T): T = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt index 52453e44edd..b2b081391ba 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // IGNORE_BACKEND: NATIVE import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class A { var result = mutableListOf("O", "K", null) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt index eed8775a6eb..83fe0649162 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* import kotlin.properties.Delegates class Pipe { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt index 719d2e11738..e65f3f23746 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* data class A(val o: String) { operator fun component2(): String = "K" diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt index 02c97d81531..ed46a46ef11 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals class A(val w: String) { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt index 2e50e1f256a..8571bb6c0a6 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals class A(val w: String) { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt index 9cea4eda0fe..92b6d97f914 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* data class A(val o: String) { operator suspend fun component2(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt index 14e162a5c67..00a3798ceb2 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: A): A = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt index 009ee3fce88..182911c47aa 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: A): A = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt index f8795af2d6e..cd352489f3a 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: A): A = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt index 07e9f23fcf2..6e9a21f41ea 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* class CompilerKillingIterator(private val underlying: Iterator, private val transform: suspend (e: T) -> Iterator) { private var currentIt: Iterator = object : Iterator { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt index ade0b26af41..7829afd697e 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* class CompilerKillingIterator(private val underlying: Iterator, private val transform: suspend (e: T) -> Iterator) { private var currentIt: Iterator = object : Iterator { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt index fcc0cf8bf29..b9a9558ea51 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals suspend fun ArrayList.yield(v: Int): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt index 077998c33d7..b3093221741 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend infix fun Int.test(x : Int) : Int { if (this > 1) { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt index 6b1ecd9e4ca..9b644f4b38c 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend infix fun Int.foo(x: Int) { if (x == 0) return diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt index a3e07f8f56e..17871dd2a1b 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun Iterator.foldl(acc : A, foldFunction : (e : T, acc : A) -> A) : A = if (!hasNext()) acc diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt index 0b168f575c6..b8b91ce75a8 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt @@ -1,7 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend fun escapeChar(c : Char) : String? = when (c) { '\\' -> "\\\\" diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt index 5cd710e4333..1e6e31cf888 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES // DONT_RUN_GENERATED_CODE: JS +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun String.repeat(num : Int, acc : StringBuilder = StringBuilder()) : String = if (num == 0) acc.toString() diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt index 3600eafc3d1..8cf0c689920 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun foo(x: Int) { if (x == 0) return diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt index 99952664024..6355270dac6 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun sum(x: Long, sum: Long): Long { if (x == 0.toLong()) return sum diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt index 168b8f7d2c5..df9aeb6a5da 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun foo(x: Int) { return if (x > 0) { diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt index 9f0d5831654..b131b38901b 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun foo(x: Int) { if (x == 0) return diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt index e4901f6dc4c..eb3d58c6158 100644 --- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt +++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // DONT_RUN_GENERATED_CODE: JS import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* tailrec suspend fun withWhen(counter : Int, d : Any) : Int = if (counter == 0) { diff --git a/compiler/testData/codegen/box/coroutines/generate.kt b/compiler/testData/codegen/box/coroutines/generate.kt index 9d769af94b0..6165f7196b5 100644 --- a/compiler/testData/codegen/box/coroutines/generate.kt +++ b/compiler/testData/codegen/box/coroutines/generate.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // FULL_JDK -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun box(): String { val x = gen().joinToString() diff --git a/compiler/testData/codegen/box/coroutines/handleException.kt b/compiler/testData/codegen/box/coroutines/handleException.kt index 8e26112b72e..ec48750e7f2 100644 --- a/compiler/testData/codegen/box/coroutines/handleException.kt +++ b/compiler/testData/codegen/box/coroutines/handleException.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var exception: Throwable? = null diff --git a/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt b/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt index d76960c8fb3..c30b0d23890 100644 --- a/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt +++ b/compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit): String { diff --git a/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt b/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt index 29d1a5916f5..e8231e9be0b 100644 --- a/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt +++ b/compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt b/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt index 194707f6e99..4f8e80a6674 100644 --- a/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt +++ b/compiler/testData/codegen/box/coroutines/handleResultSuspended.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var log = "" diff --git a/compiler/testData/codegen/box/coroutines/illegalState.kt b/compiler/testData/codegen/box/coroutines/illegalState.kt index e05d0d5aeb3..0ef59de0bfb 100644 --- a/compiler/testData/codegen/box/coroutines/illegalState.kt +++ b/compiler/testData/codegen/box/coroutines/illegalState.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // TARGET_BACKEND: JVM -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> x.resume(Unit) diff --git a/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt b/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt index 07b6ed72e8b..53113bc548a 100644 --- a/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt +++ b/compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var stopped = false var log = "" diff --git a/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt b/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt index 4eee3b4e2ac..56e18cdd9bf 100644 --- a/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: Any?): String = suspendCoroutineOrReturn { x -> x.resume(v?.toString() ?: "") diff --git a/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt b/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt index e8ebf741eef..7cdfa745cc9 100644 --- a/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt +++ b/compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES // WITH_REFLECT +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt b/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt index 9930735b6ff..0ba1655d697 100644 --- a/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt +++ b/compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt @@ -1,13 +1,14 @@ // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // WITH_REFLECT // CHECK_NOT_CALLED: suspendInline_61zpoe$ // CHECK_NOT_CALLED: suspendInline_6r51u9$ // CHECK_NOT_CALLED: suspendInline -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { fun withValue(v: String, x: Continuation) { diff --git a/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt b/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt index 1417a30a017..aabf414bb5d 100644 --- a/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt +++ b/compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt b/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt index 9a15bcf4111..dbe50d64260 100644 --- a/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt +++ b/compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var i = 0 diff --git a/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt b/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt index b39aed2861b..4df5b8dd0ed 100644 --- a/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt +++ b/compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt @@ -1,10 +1,11 @@ // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // WITH_REFLECT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun runInstanceOf(): Boolean = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt index daf63a1d47b..b363ca35c33 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt index d991a7cc85b..38ebc6eaf42 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt index 4aceec9ce80..8f507e0c546 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt index 242c5c0ec2a..8d237fe14b3 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt index 3f614fd8f35..d0f02993325 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt index 8d879ef9b93..400c8ac5442 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt index e93b94f13e7..4be05d14b08 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // TARGET_BACKEND: JVM -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt index fbea445b8fa..7db35d5939a 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt index 404f95df912..259e90d356c 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // TARGET_BACKEND: JVM -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt index 4afdab1b92f..4feea6ad09e 100644 --- a/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt +++ b/compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt index 12299008074..f312f73d1a2 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt @@ -1,3 +1,4 @@ +// !API_VERSION: 1.2 // WITH_RUNTIME // WITH_COROUTINES import helpers.* diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt index e1d71801d21..29e3072307c 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt @@ -1,3 +1,4 @@ +// !API_VERSION: 1.2 // WITH_RUNTIME // WITH_COROUTINES import helpers.* diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt index 5b48bcc8bea..09ec334015b 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt @@ -1,3 +1,4 @@ +// !API_VERSION: 1.2 // WITH_RUNTIME // WITH_COROUTINES import helpers.* diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt index ed7d186092d..4e4386ab6d9 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHereUnintercepted(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt index ea431a3697c..4d191904eac 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt index 5f91a55d81f..2e7d818e859 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt index 680af4e20cf..726e385c309 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt index a190beb19c1..81c370f4c45 100644 --- a/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt +++ b/compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.test.assertEquals suspend fun suspendHere(): String = suspendCoroutineUninterceptedOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/iterateOverArray.kt b/compiler/testData/codegen/box/coroutines/iterateOverArray.kt index 837df4220be..d5516148a56 100644 --- a/compiler/testData/codegen/box/coroutines/iterateOverArray.kt +++ b/compiler/testData/codegen/box/coroutines/iterateOverArray.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/kt12958.kt b/compiler/testData/codegen/box/coroutines/kt12958.kt index 898aa866d02..0faa7ef7053 100644 --- a/compiler/testData/codegen/box/coroutines/kt12958.kt +++ b/compiler/testData/codegen/box/coroutines/kt12958.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // WITH_CONTINUATION -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(v: V): V = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/kt15016.kt b/compiler/testData/codegen/box/coroutines/kt15016.kt index b57740e55e7..8d013c412e2 100644 --- a/compiler/testData/codegen/box/coroutines/kt15016.kt +++ b/compiler/testData/codegen/box/coroutines/kt15016.kt @@ -1,10 +1,11 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED -import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn -import kotlin.coroutines.experimental.startCoroutine +import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED +import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn +import COROUTINES_PACKAGE.startCoroutine class Bar(val x: Any) inline fun Any.map(transform: (Any) -> Any) { diff --git a/compiler/testData/codegen/box/coroutines/kt15017.kt b/compiler/testData/codegen/box/coroutines/kt15017.kt index 8833e3c0d33..bac545e3a38 100644 --- a/compiler/testData/codegen/box/coroutines/kt15017.kt +++ b/compiler/testData/codegen/box/coroutines/kt15017.kt @@ -1,7 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.startCoroutine +import COROUTINES_PACKAGE.startCoroutine class Controller { suspend inline fun suspendInlineThrow(v: String): String = throw RuntimeException(v) diff --git a/compiler/testData/codegen/box/coroutines/kt15930.kt b/compiler/testData/codegen/box/coroutines/kt15930.kt index 491a9178423..e91813a3211 100644 --- a/compiler/testData/codegen/box/coroutines/kt15930.kt +++ b/compiler/testData/codegen/box/coroutines/kt15930.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.intrinsics.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.intrinsics.* +import COROUTINES_PACKAGE.* class A { var isMinusAssignCalled = false diff --git a/compiler/testData/codegen/box/coroutines/kt21605.kt b/compiler/testData/codegen/box/coroutines/kt21605.kt index 8ebd0f0d656..738382154f8 100644 --- a/compiler/testData/codegen/box/coroutines/kt21605.kt +++ b/compiler/testData/codegen/box/coroutines/kt21605.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* interface Consumer { fun consume(s: String) } diff --git a/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt b/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt index 0040d7d273d..342f7df17c9 100644 --- a/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt +++ b/compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var result = "" diff --git a/compiler/testData/codegen/box/coroutines/lastStatementInc.kt b/compiler/testData/codegen/box/coroutines/lastStatementInc.kt index 01b91ba8a30..330b0e94764 100644 --- a/compiler/testData/codegen/box/coroutines/lastStatementInc.kt +++ b/compiler/testData/codegen/box/coroutines/lastStatementInc.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt b/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt index 47bf76f5fa4..9f5180c5ec0 100644 --- a/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt +++ b/compiler/testData/codegen/box/coroutines/lastStementAssignment.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt b/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt index d4ebf0b9400..ed270fa82b0 100644 --- a/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt +++ b/compiler/testData/codegen/box/coroutines/lastUnitExpression.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var ok = false diff --git a/compiler/testData/codegen/box/coroutines/localCallableRef.kt b/compiler/testData/codegen/box/coroutines/localCallableRef.kt index a1e04353a0b..22329a2b722 100644 --- a/compiler/testData/codegen/box/coroutines/localCallableRef.kt +++ b/compiler/testData/codegen/box/coroutines/localCallableRef.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendWithValue(result: () -> String): String = suspendCoroutineOrReturn { x -> x.resume(result()) diff --git a/compiler/testData/codegen/box/coroutines/localDelegate.kt b/compiler/testData/codegen/box/coroutines/localDelegate.kt index c2147c44556..fcb9a0cebc5 100644 --- a/compiler/testData/codegen/box/coroutines/localDelegate.kt +++ b/compiler/testData/codegen/box/coroutines/localDelegate.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED -import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED +import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn class OkDelegate { operator fun getValue(receiver: Any?, property: Any?): String = "OK" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt index 9cc231cd31d..cb8773243fd 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(a: String, b: String): String { suspend fun local() = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt index c697ec3a6fb..05a2b4bae78 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(): String { val a = "O" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt index 4b858fea2f1..b263d329f93 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(): String { suspend fun String.local() = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt index eec52d1c34c..13b0b00e31b 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(): String { suspend infix fun String.local(a: String) = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt index 7f28448d169..6fc9018cbb0 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(): String { val l: suspend () -> String = { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt index f01ccf45375..e895cfc5926 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(): String { suspend fun local(): String { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt index 127a7420bf9..b438db745ec 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend fun callLocal(): String { suspend fun local() = "OK" diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt index a3234a0067f..8c4c7b5cae3 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(): String { suspend fun local() = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt index d103e70fc68..cf4104a3f4b 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var result = "FAIL" var i = 0 diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt b/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt index 3ad78a5ce7b..418dc3c1c14 100644 --- a/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt +++ b/compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun callLocal(a: String, b: String): String { suspend fun local(a: String, b: String) = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt b/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt index 48a506eb0a2..b94536bd869 100644 --- a/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt +++ b/compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun getLong(): Long = suspendCoroutineOrReturn { x -> x.resume(1234567890123L) diff --git a/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt b/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt index 6570d321cb9..10ccb4ba6cc 100644 --- a/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt +++ b/compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(r: LongRange): Long = suspendCoroutineOrReturn { x -> x.resume(r.start + r.endInclusive) diff --git a/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt b/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt index 56eef56af1d..271bc8c62fa 100644 --- a/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt +++ b/compiler/testData/codegen/box/coroutines/mergeNullAndString.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt index 3675315f0ca..406d41cb7de 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt @@ -8,9 +8,10 @@ inline fun foo(x: String = "OK"): String { // FILE: main.kt // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var result = "" diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt index ad5db0563d9..6254ceccabb 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt @@ -1,13 +1,14 @@ // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME +// COMMON_COROUTINES_TEST // MODULE: lib(support) // FILE: lib.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -39,8 +40,8 @@ fun builder(c: suspend () -> Unit) { // MODULE: main(lib) // FILE: main.kt -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun baz() { bar("A") diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt index bc9a47a50f5..41ecdea527f 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt @@ -2,13 +2,14 @@ // IGNORE_BACKEND: JVM // WITH_COROUTINES // WITH_RUNTIME +// COMMON_COROUTINES_TEST // MODULE: lib(support) // FILE: lib.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -46,8 +47,8 @@ fun builder(c: suspend () -> Unit) { // MODULE: main(lib) // FILE: main.kt -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun baz() { val a = A("A") diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt index 902ef8e991f..891c81eb7ab 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt @@ -1,13 +1,14 @@ // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME +// COMMON_COROUTINES_TEST // MODULE: lib(support) // FILE: lib.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -43,8 +44,8 @@ fun C.builder(c: suspend C.() -> Unit) { // MODULE: main(lib) // FILE: main.kt -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun C.baz() { v = "A" diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt index 0b1cfebcd66..5016a6002e9 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt @@ -1,13 +1,14 @@ // IGNORE_BACKEND: NATIVE // WITH_COROUTINES // WITH_RUNTIME +// COMMON_COROUTINES_TEST // MODULE: lib(support) // FILE: lib.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var continuation: () -> Unit = { } var log = "" @@ -43,8 +44,8 @@ fun builder(c: suspend () -> Unit) { // MODULE: main(lib) // FILE: main.kt -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun baz() { val a = bar("A") diff --git a/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt b/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt index edb8ccb72ae..204539f0b59 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt @@ -1,6 +1,7 @@ // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // MODULE: lib // FILE: lib.kt suspend inline fun foo(v: String): String = v @@ -10,8 +11,8 @@ suspend inline fun bar(): String = foo("O") // MODULE: main(lib, support) // FILE: main.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt index a495e263bf0..23579b3a610 100644 --- a/compiler/testData/codegen/box/coroutines/multiModule/simple.kt +++ b/compiler/testData/codegen/box/coroutines/multiModule/simple.kt @@ -1,12 +1,13 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // MODULE: controller(support) // FILE: controller.kt package lib import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> @@ -19,8 +20,8 @@ class Controller { // FILE: main.kt import lib.* import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend Controller.() -> Unit) { c.startCoroutine(Controller(), EmptyContinuation) diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt index 236984b79b8..24ae9e07683 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt index 328d8a86bc8..07f26072fb9 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt index f9966c09e39..331ba4b2fc2 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt index 261e28bbe76..09d2bd71a43 100644 --- a/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt +++ b/compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var lastSuspension: Continuation? = null diff --git a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt index 00f56d8a33c..23eb0681086 100644 --- a/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/nestedTryCatch.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt b/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt index 67f38388a8a..c8eddab8a3b 100644 --- a/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt +++ b/compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Int): Int { diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt index e0c9fda657d..d41f2b8927d 100644 --- a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt +++ b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var cResult = 0 diff --git a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt index a7d30544230..200209478cd 100644 --- a/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt +++ b/compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { diff --git a/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt b/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt index 1ec19b6a9fc..4c1b3b6ec05 100644 --- a/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt +++ b/compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun box(): String { async { diff --git a/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt b/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt index c693392c26f..f1826406064 100644 --- a/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/recursiveSuspend.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun box(): String { var result = 0 diff --git a/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt b/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt index 9078837334c..3d18f88e93e 100644 --- a/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt +++ b/compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* private var prevSender: String = "FAIL" diff --git a/compiler/testData/codegen/box/coroutines/returnByLabel.kt b/compiler/testData/codegen/box/coroutines/returnByLabel.kt index 81fa92a38f1..4c26491f450 100644 --- a/compiler/testData/codegen/box/coroutines/returnByLabel.kt +++ b/compiler/testData/codegen/box/coroutines/returnByLabel.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/simple.kt b/compiler/testData/codegen/box/coroutines/simple.kt index ae03b0d56af..bdf1ad95bb6 100644 --- a/compiler/testData/codegen/box/coroutines/simple.kt +++ b/compiler/testData/codegen/box/coroutines/simple.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/simpleException.kt b/compiler/testData/codegen/box/coroutines/simpleException.kt index 2307339a201..f6ae6c15840 100644 --- a/compiler/testData/codegen/box/coroutines/simpleException.kt +++ b/compiler/testData/codegen/box/coroutines/simpleException.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt index f8bd4873718..6d88f68a755 100644 --- a/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt index efc497ee9e2..67be6b24d95 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = throw RuntimeException("OK") diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt index 6edf9a2358a..451b30cfd6d 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt @@ -1,13 +1,14 @@ // IGNORE_BACKEND: NATIVE // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // WITH_REFLECT // CHECK_NOT_CALLED: suspendInline_61zpoe$ // CHECK_NOT_CALLED: suspendInline_6r51u9$ // CHECK_NOT_CALLED: suspendInline -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend inline fun suspendInline(v: String): String = v diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt index a68cf5d57db..0b49fa281b0 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere() = "OK" diff --git a/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt b/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt index 9e7f00ef2bc..fe5a8d979a8 100644 --- a/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt +++ b/compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Int = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt b/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt index 6742910c6ac..4b85fed1c46 100644 --- a/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt +++ b/compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var globalResult = "" suspend fun suspendWithValue(v: String): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt b/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt index 99d50f8d734..27738abfa8a 100644 --- a/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn +import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED fun box(): String { async { diff --git a/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt b/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt index 47f3b910a9b..06045ce04b6 100644 --- a/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt +++ b/compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.startCoroutine -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.startCoroutine +import COROUTINES_PACKAGE.intrinsics.* interface TestInterface { suspend fun toInt(): Int = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendDelegation.kt b/compiler/testData/codegen/box/coroutines/suspendDelegation.kt index 5de17bdedb8..030d4b04a9c 100644 --- a/compiler/testData/codegen/box/coroutines/suspendDelegation.kt +++ b/compiler/testData/codegen/box/coroutines/suspendDelegation.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendThere() diff --git a/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt b/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt index c4599e8c742..b76c2c3ed67 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(v: Int): Int = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt b/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt index 73233d3b3b6..031e865d4b4 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt @@ -1,11 +1,12 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // FILE: stuff.kt package stuff import helpers.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.intrinsics.* object Host { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> @@ -17,8 +18,8 @@ object Host { // FILE: test.kt import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import stuff.Host.suspendHere fun builder(c: suspend () -> Unit) { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt index 4e2c9a69149..adbe7e1da71 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var log = "" diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt index 4088d4cc9f2..ea5432cb848 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var exception: Throwable? = null diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt index 360e8d70bc1..55dd7a5d30b 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt index 38629523faa..c9c9af45054 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED -import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED +import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn class MyTest { suspend fun act(value: String): String = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt index f13526f6416..057b1fe3d85 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class A(val v: String) { suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt index 62da22fa57d..0f56f4aa7f0 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED -import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.COROUTINE_SUSPENDED +import COROUTINES_PACKAGE.intrinsics.suspendCoroutineOrReturn class MyTest { suspend fun act(value: String): String = suspendCoroutineOrReturn { diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt index 0d22667d747..d5fe8964f65 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt @@ -1,10 +1,11 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // FILE: main.kt // TARGET_BACKEND: JVM import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* @@ -34,7 +35,7 @@ fun box(): String { } // FILE: JavaClass.java -import kotlin.coroutines.experimental.*; +import COROUTINES_PACKAGE.*; public class JavaClass { public static String foo() { final String[] res = new String[1]; diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt index 2b069d242d6..9561c521751 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* import kotlin.reflect.KProperty suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt index b8d8d409a18..a57acb46ce9 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class X { var res = "" diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt index f29775db5f6..e2bc366abd7 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var x = true diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt index ba957747645..eb1d153b6ac 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt index 211888c934c..c9ce7560334 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt index 49a322a5136..6478c97f09a 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class A(val v: String) { suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt index 6763e99ab1f..90f9e8328aa 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* abstract class A(val v: String) { suspend abstract fun foo(v: String): String diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt index 3913958cdb8..cdbd7138713 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* interface A { val v: String diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt index 7c2d1ca1c86..4ec1817d3a2 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt index a8c381a5e64..d1dd10af0b0 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt index 88c63c02c73..cfbcc122bbf 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt index eee4b341107..69f25ac433f 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt index 3607b1009c4..b3d072f9ee1 100644 --- a/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt +++ b/compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt @@ -1,3 +1,4 @@ +// !API_VERSION: 1.2 // WITH_RUNTIME // WITH_COROUTINES import helpers.* diff --git a/compiler/testData/codegen/box/coroutines/suspendInCycle.kt b/compiler/testData/codegen/box/coroutines/suspendInCycle.kt index 345d7ecbfd5..eade24e38fb 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInCycle.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInCycle.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { var i = 0 diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt index 6b567b1e0bf..0ef9b399797 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt index 8e0f4ef2605..23c38c172a5 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt index d68f224d6ce..6a5fb2beda7 100644 --- a/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt +++ b/compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt index 91271e456fb..42139d25d9b 100644 --- a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt +++ b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class TestClass { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt index 2d4f6790b9d..e9666861ecc 100644 --- a/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt +++ b/compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class TestClass { suspend fun toInt(): Int = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt index d15975249ad..e0ebeaafd8f 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt @@ -1,10 +1,11 @@ // IGNORE_BACKEND: JS +// COMMON_COROUTINES_TEST // WITH_RUNTIME // WITH_COROUTINES // CHECK_BYTECODE_LISTING import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* interface SourceCrossinline { suspend fun consume(sink: Sink) diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt index e27d95ea936..256ed8994bf 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt @@ -11,7 +11,7 @@ public final class CrossinlineKt$box$1$doResume$$inlined$filter$1$1 { synthetic final field this$0: CrossinlineKt$box$1$doResume$$inlined$filter$1 inner class CrossinlineKt$box$1$doResume$$inlined$filter$1 inner class CrossinlineKt$box$1$doResume$$inlined$filter$1$1 - public method (p0: CrossinlineKt$box$1$doResume$$inlined$filter$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$box$1$doResume$$inlined$filter$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -27,7 +27,7 @@ public final class CrossinlineKt$box$1$doResume$$inlined$filter$1$2$1 { synthetic final field this$0: CrossinlineKt$box$1$doResume$$inlined$filter$1$2 inner class CrossinlineKt$box$1$doResume$$inlined$filter$1$2 inner class CrossinlineKt$box$1$doResume$$inlined$filter$1$2$1 - public method (p0: CrossinlineKt$box$1$doResume$$inlined$filter$1$2, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$box$1$doResume$$inlined$filter$1$2, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -41,7 +41,7 @@ public final class CrossinlineKt$box$1$doResume$$inlined$filter$1$2 { inner class CrossinlineKt$box$1$doResume$$inlined$filter$1$2$1 public method (p0: Sink, p1: CrossinlineKt$box$1$doResume$$inlined$filter$1): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -50,7 +50,7 @@ public final class CrossinlineKt$box$1$doResume$$inlined$filter$1 { inner class CrossinlineKt$box$1$doResume$$inlined$filter$1 inner class CrossinlineKt$box$1$doResume$$inlined$filter$1$1 public method (p0: SourceCrossinline): void - public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -60,7 +60,7 @@ public final class CrossinlineKt$box$1$doResume$$inlined$fold$1 { inner class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 public method (p0: kotlin.jvm.internal.Ref$ObjectRef): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -76,7 +76,7 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 { synthetic final field this$0: CrossinlineKt$box$1$filter$$inlined$source$1 inner class CrossinlineKt$box$1$filter$$inlined$source$1 inner class CrossinlineKt$box$1$filter$$inlined$source$1$1 - public method (p0: CrossinlineKt$box$1$filter$$inlined$source$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$box$1$filter$$inlined$source$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -92,7 +92,7 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1$1 { synthetic final field this$0: CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1 inner class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1 inner class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1$1 - public method (p0: CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -106,7 +106,7 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1 { inner class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1$1 public method (p0: Sink, p1: CrossinlineKt$box$1$filter$$inlined$source$1): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -116,7 +116,7 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1 { inner class CrossinlineKt$box$1$filter$$inlined$source$1 inner class CrossinlineKt$box$1$filter$$inlined$source$1$1 public method (p0: SourceCrossinline, p1: kotlin.jvm.functions.Function1): void - public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -126,7 +126,7 @@ public final class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 { synthetic final field this$0: CrossinlineKt$box$1$fold$$inlined$consumeEach$1 inner class CrossinlineKt$box$1$fold$$inlined$consumeEach$1 inner class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 - public method (p0: CrossinlineKt$box$1$fold$$inlined$consumeEach$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$box$1$fold$$inlined$consumeEach$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -140,7 +140,7 @@ public final class CrossinlineKt$box$1$fold$$inlined$consumeEach$1 { inner class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 public method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.functions.Function3): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -152,10 +152,10 @@ final class CrossinlineKt$box$1 { field L$3: java.lang.Object field L$4: java.lang.Object inner class CrossinlineKt$box$1 - method (p0: kotlin.jvm.internal.Ref$IntRef, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation + method (p0: kotlin.jvm.internal.Ref$IntRef, p1: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @@ -166,7 +166,7 @@ public final class CrossinlineKt$consumeEach$2$send$1 { synthetic final field this$0: CrossinlineKt$consumeEach$2 inner class CrossinlineKt$consumeEach$2 inner class CrossinlineKt$consumeEach$2$send$1 - public method (p0: CrossinlineKt$consumeEach$2, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$consumeEach$2, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -179,7 +179,7 @@ public final class CrossinlineKt$consumeEach$2 { inner class CrossinlineKt$consumeEach$2$send$1 public method (p0: kotlin.jvm.functions.Function2): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -195,7 +195,7 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 { synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1 inner class CrossinlineKt$filter$$inlined$source$1 inner class CrossinlineKt$filter$$inlined$source$1$1 - public method (p0: CrossinlineKt$filter$$inlined$source$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$filter$$inlined$source$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -211,7 +211,7 @@ public final class CrossinlineKt$filter$$inlined$source$1$lambda$1$1 { synthetic final field this$0: CrossinlineKt$filter$$inlined$source$1$lambda$1 inner class CrossinlineKt$filter$$inlined$source$1$lambda$1 inner class CrossinlineKt$filter$$inlined$source$1$lambda$1$1 - public method (p0: CrossinlineKt$filter$$inlined$source$1$lambda$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$filter$$inlined$source$1$lambda$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -225,7 +225,7 @@ public final class CrossinlineKt$filter$$inlined$source$1$lambda$1 { inner class CrossinlineKt$filter$$inlined$source$1$lambda$1$1 public method (p0: Sink, p1: CrossinlineKt$filter$$inlined$source$1): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -235,7 +235,7 @@ public final class CrossinlineKt$filter$$inlined$source$1 { inner class CrossinlineKt$filter$$inlined$source$1 inner class CrossinlineKt$filter$$inlined$source$1$1 public method (p0: SourceCrossinline, p1: kotlin.jvm.functions.Function1): void - public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -245,7 +245,7 @@ public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 { synthetic final field this$0: CrossinlineKt$fold$$inlined$consumeEach$1 inner class CrossinlineKt$fold$$inlined$consumeEach$1 inner class CrossinlineKt$fold$$inlined$consumeEach$1$1 - public method (p0: CrossinlineKt$fold$$inlined$consumeEach$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$fold$$inlined$consumeEach$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -259,7 +259,7 @@ public final class CrossinlineKt$fold$$inlined$consumeEach$1 { inner class CrossinlineKt$fold$$inlined$consumeEach$1$1 public method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.functions.Function3): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -276,7 +276,7 @@ public final class CrossinlineKt$range$$inlined$source$1$1 { synthetic final field this$0: CrossinlineKt$range$$inlined$source$1 inner class CrossinlineKt$range$$inlined$source$1 inner class CrossinlineKt$range$$inlined$source$1$1 - public method (p0: CrossinlineKt$range$$inlined$source$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$range$$inlined$source$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -289,7 +289,7 @@ public final class CrossinlineKt$range$$inlined$source$1 { inner class CrossinlineKt$range$$inlined$source$1 inner class CrossinlineKt$range$$inlined$source$1$1 public method (p0: int, p1: int): void - public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -299,7 +299,7 @@ public final class CrossinlineKt$source$1$consume$1 { synthetic final field this$0: CrossinlineKt$source$1 inner class CrossinlineKt$source$1 inner class CrossinlineKt$source$1$consume$1 - public method (p0: CrossinlineKt$source$1, p1: kotlin.coroutines.experimental.Continuation): void + public method (p0: CrossinlineKt$source$1, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -311,7 +311,7 @@ public final class CrossinlineKt$source$1 { inner class CrossinlineKt$source$1 inner class CrossinlineKt$source$1$consume$1 public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -321,9 +321,9 @@ public final class CrossinlineKt { inner class CrossinlineKt$source$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - private final static method consumeEach(@org.jetbrains.annotations.NotNull p0: SourceCrossinline, p1: kotlin.jvm.functions.Function2, p2: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final static method consumeEach(@org.jetbrains.annotations.NotNull p0: SourceCrossinline, p1: kotlin.jvm.functions.Function2, p2: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method filter(@org.jetbrains.annotations.NotNull p0: SourceCrossinline, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): SourceCrossinline - private final static method fold(@org.jetbrains.annotations.NotNull p0: SourceCrossinline, p1: java.lang.Object, p2: kotlin.jvm.functions.Function3, p3: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final static method fold(@org.jetbrains.annotations.NotNull p0: SourceCrossinline, p1: java.lang.Object, p2: kotlin.jvm.functions.Function3, p3: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static method isGood(p0: int): boolean public final static @org.jetbrains.annotations.NotNull method range(@org.jetbrains.annotations.NotNull p0: SourceCrossinline$Factory, p1: int, p2: int): SourceCrossinline public final static @org.jetbrains.annotations.NotNull method source(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): SourceCrossinline @@ -332,7 +332,7 @@ public final class CrossinlineKt { @kotlin.Metadata public interface Sink { public abstract method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void - public abstract @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method send(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -348,5 +348,5 @@ public interface SourceCrossinline { public final static field Factory: SourceCrossinline$Factory inner class SourceCrossinline$Factory static method (): void - public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method consume(@org.jetbrains.annotations.NotNull p0: Sink, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt index daa5b93de44..74fb73aff81 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt @@ -1,11 +1,12 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // CHECK_BYTECODE_LISTING // CHECK_NEW_COUNT: function=suspendHere count=1 // CHECK_NEW_COUNT: function=mainSuspend count=1 -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* inline suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.txt index 957dbe4f089..10bf75e84b6 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.txt @@ -3,10 +3,10 @@ final class InlineWithStateMachineKt$box$1 { synthetic final field $result: kotlin.jvm.internal.Ref$ObjectRef field L$0: java.lang.Object inner class InlineWithStateMachineKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation + method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @@ -17,7 +17,7 @@ final class InlineWithStateMachineKt$mainSuspend$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class InlineWithStateMachineKt$mainSuspend$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -29,7 +29,7 @@ public final class InlineWithStateMachineKt { inner class InlineWithStateMachineKt$mainSuspend$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - public final static @org.jetbrains.annotations.Nullable method mainSuspend(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - private final static method suspendHere(p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - private final static method suspendThere(p0: java.lang.String, p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method mainSuspend(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + private final static method suspendHere(p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + private final static method suspendThere(p0: java.lang.String, p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt index 809d3f3a905..faa9c91f079 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt @@ -1,11 +1,12 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* // CHECK_BYTECODE_LISTING // CHECK_NEW_COUNT: function=suspendHere count=0 // CHECK_NEW_COUNT: function=complexSuspend count=0 -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* inline suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.txt index 392690e6a40..09ef8dcb272 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.txt @@ -4,10 +4,10 @@ final class InlineWithoutStateMachineKt$box$1 { field L$0: java.lang.Object field L$1: java.lang.Object inner class InlineWithoutStateMachineKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation + method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @@ -17,7 +17,7 @@ final class InlineWithoutStateMachineKt$complexSuspend$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class InlineWithoutStateMachineKt$complexSuspend$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -29,7 +29,7 @@ public final class InlineWithoutStateMachineKt { inner class InlineWithoutStateMachineKt$complexSuspend$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - public final static @org.jetbrains.annotations.Nullable method complexSuspend(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - private final static method suspendThere(p0: java.lang.String, p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method complexSuspend(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + private final static method suspendThere(p0: java.lang.String, p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt index c073ec293aa..74e248d3ea4 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt @@ -2,9 +2,10 @@ // WITH_COROUTINES // CHECK_BYTECODE_LISTING // CHECK_NEW_COUNT: function=suspendHere count=0 +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.txt index 18525856960..5b367695740 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.txt @@ -3,10 +3,10 @@ final class SimpleKt$box$1 { synthetic final field $result: kotlin.jvm.internal.Ref$ObjectRef field L$0: java.lang.Object inner class SimpleKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation + method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @@ -15,6 +15,6 @@ public final class SimpleKt { inner class SimpleKt$box$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendThere(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt index 8207febcf58..a0b5124c07e 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* val postponedActions = ArrayList<() -> Unit>() diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt index 7cf6550f850..b70f913898f 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun twoReturns(c: suspend () -> Unit) { return c() diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt index 2181d2ad903..7c3cfb2c53f 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST // CHECK_BYTECODE_LISTING import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* sealed class X { class A : X() diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.txt index f4e4128657d..c748f450074 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.txt @@ -1,10 +1,10 @@ @kotlin.Metadata final class WhenUnitKt$box$1 { inner class WhenUnitKt$box$1 - method (p0: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation + method (p0: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @@ -16,9 +16,9 @@ public final class WhenUnitKt { public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void public final static @org.jetbrains.annotations.NotNull method getLog(): java.lang.String - public final static @org.jetbrains.annotations.Nullable method process(@org.jetbrains.annotations.NotNull p0: X$A, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method process(@org.jetbrains.annotations.NotNull p0: X$B, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method process(@org.jetbrains.annotations.NotNull p0: X, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method process(@org.jetbrains.annotations.NotNull p0: X$A, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method process(@org.jetbrains.annotations.NotNull p0: X$B, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method process(@org.jetbrains.annotations.NotNull p0: X, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static method setLog(@org.jetbrains.annotations.NotNull p0: java.lang.String): void } diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt index 1f1fcb98b80..1601aa71f59 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun foo(x: Any): Int { return if (x == "56") suspendHere() else 13 diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt index c3fe2873410..6efb763f6a8 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun foo(x: Any): Int { return try { diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt index 5e0dc9747db..12222f517af 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun foo(x: Any): Int { return when { diff --git a/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt b/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt index 3dc260dc183..1befc5aec33 100644 --- a/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt +++ b/compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt @@ -1,7 +1,8 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun box(): String { async { diff --git a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt index 6736cdbe9e0..286aee16ae5 100644 --- a/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt index 2c720c010d2..ca84ec6404d 100644 --- a/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt b/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt index 4a6d7d0bf11..d2378e0111d 100644 --- a/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt +++ b/compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(v: String): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt b/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt index 9c2d48c87b2..a3b859bb48d 100644 --- a/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt +++ b/compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var globalResult = "" var wasCalled = false diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt index e8dfb09649b..664d3169e16 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt index 623e3dbb236..9a0a761104c 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt index a56b3e5e4ed..118a822d86d 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var result = "0" diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt index 3430a0d10ad..3e9bd2f7b20 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var result = "0" diff --git a/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt b/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt index d30ac085327..e0cee798d7d 100644 --- a/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt +++ b/compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var log = "" var postponed: () -> Unit = { } diff --git a/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt b/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt index b18b763100d..e29dc062a2c 100644 --- a/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt +++ b/compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt b/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt index 0f09377dbfa..5e15dca0605 100644 --- a/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt +++ b/compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun foo(value: String): String = suspendCoroutineOrReturn { x -> x.resume(value) diff --git a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt index fa02930895c..4cba969d68c 100644 --- a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt +++ b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt index 024392c2b04..bf7079986ee 100644 --- a/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt +++ b/compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME // WITH_COROUTINES +// COMMON_COROUTINES_TEST import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt b/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt index b05baf1a4ec..9c68456d4a7 100644 --- a/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt +++ b/compiler/testData/codegen/boxInline/suspend/capturedVariables.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend inline fun test1(c: suspend () -> Unit) { c() @@ -13,9 +14,10 @@ suspend inline fun test2(crossinline c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt b/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt index 1c1f5e01291..b6b6d12a103 100644 --- a/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* inline suspend fun foo(crossinline a: suspend () -> Unit, crossinline b: suspend () -> Unit) { var x = "OK" @@ -28,6 +29,7 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST fun box(): String { var y = "fail" diff --git a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt index 6cb9bfcee8d..38b424c2a03 100644 --- a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt @@ -1,8 +1,9 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* class Controller { var res = "FAIL 1" @@ -35,8 +36,9 @@ suspend inline fun test3(controller: Controller = defaultController, crossinline } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt index 454019d56ca..bebcb17605e 100644 --- a/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt +++ b/compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt @@ -1,8 +1,9 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* class Controller { var res = "FAIL 1" @@ -15,8 +16,9 @@ suspend inline fun test(controller: Controller = defaultController, c: suspend C } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt index 610a3d54484..7ac8ac9aab5 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) // Are suspend calls possible inside lambda matching to the parameter @@ -39,6 +40,7 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt index fd040597bed..fd2f34188a8 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) // Start coroutine call is possible @@ -46,6 +47,7 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt index d7957faf36d..ce762521e74 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt @@ -1,4 +1,5 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -33,10 +34,11 @@ suspend inline fun test5(crossinline c: suspend() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* -import kotlin.coroutines.experimental.jvm.internal.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* +import COROUTINES_PACKAGE.jvm.internal.* object EmptyContinuation: Continuation { override val context: CoroutineContext diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt index 8cac8f9d612..30e4d8cc326 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -43,8 +44,9 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun box() : String { var res = "FAIL 1" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt index 634555a6d1b..2c026be6949 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -30,8 +31,9 @@ suspend inline fun test3(crossinline c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt index 72d7e0d233f..8a05e18e298 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -43,8 +44,9 @@ fun builder(c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun box() : String { var res = "FAIL 1" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt index 9a41b73ceb1..6e8e45d6fce 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) // Are suspend calls possible inside lambda matching to the parameter @@ -51,8 +52,9 @@ suspend inline fun test4(noinline c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt index eb66e51dbbf..31d6b35c829 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt @@ -1,8 +1,9 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // suspend calls possible inside lambda matching to the parameter @@ -30,8 +31,9 @@ inline fun transform(crossinline c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt index 66dcd5e2bb0..46fd9840650 100644 --- a/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt @@ -1,8 +1,9 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // suspend calls possible inside lambda matching to the parameter @@ -12,8 +13,9 @@ suspend inline fun test(c: suspend () -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt b/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt index 4a44018df88..608e08f0c1a 100644 --- a/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt +++ b/compiler/testData/codegen/boxInline/suspend/multipleLocals.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -54,8 +55,9 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt b/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt index 3d54ccf8cb1..ede94ef6926 100644 --- a/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt +++ b/compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -25,8 +26,9 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt index 6efe9c0c904..bfbe2421045 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) // Are suspend calls possible inside lambda matching to the parameter @@ -43,6 +44,7 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt index 39b18aa9c39..3992c6d3723 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) // Start coroutine call is possible @@ -50,6 +51,7 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt index 9320fbb80e5..0a96fc87d12 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -47,8 +48,9 @@ fun builder(controller : Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun box() : String { val controller = Controller() diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt index b86a2d91a3c..c37dd05b485 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -34,8 +35,9 @@ class Controller { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(controller: Controller, c: suspend Controller.() -> Unit) { c.startCoroutine(controller, object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt index bced7669007..80dbc3b1cd8 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // Block is allowed to be called from nested classes/lambdas (as common crossinlines) @@ -47,8 +48,9 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun box() : String { val controller = Controller() diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt index 0911c2c92a0..8f2dba065d6 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt @@ -1,7 +1,8 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called from nested classes/lambdas (as common crossinlines) // Are suspend calls possible inside lambda matching to the parameter @@ -55,8 +56,9 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt index d6161a29029..8fec58ae61b 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt @@ -1,8 +1,9 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // suspend calls possible inside lambda matching to the parameter @@ -34,8 +35,9 @@ fun builder(controller: Controller, c: suspend Controller.() -> Unit) { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* suspend fun calculate() = "OK" diff --git a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt index 02380f73089..937260b73ad 100644 --- a/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt +++ b/compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt @@ -1,8 +1,9 @@ // FILE: test.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* // Block is allowed to be called inside the body of owner inline function // suspend calls possible inside lambda matching to the parameter @@ -16,8 +17,9 @@ class Controller { } // FILE: box.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(controller: Controller, c: suspend Controller.() -> Unit) { c.startCoroutine(controller, object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/returnValue.kt b/compiler/testData/codegen/boxInline/suspend/returnValue.kt index 6a9117411bd..1d46c637261 100644 --- a/compiler/testData/codegen/boxInline/suspend/returnValue.kt +++ b/compiler/testData/codegen/boxInline/suspend/returnValue.kt @@ -1,8 +1,9 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* inline suspend fun suspendThere(v: String): String = suspendCoroutineOrReturn { x -> x.resume(v) @@ -16,8 +17,9 @@ suspend inline fun complexSuspend(crossinline c: suspend () -> String): String { } // FILE: inleneSite.kt -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt index c16e5b230c6..e22de9f8f45 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -8,9 +9,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt index ab4102f5233..895e72172b4 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -13,9 +14,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt index c85d4b6e9e9..f1ed0cb7ca9 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt @@ -1,8 +1,9 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.intrinsics.* var i = 0; @@ -23,8 +24,9 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt index 2da59231511..30496d30afa 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -35,9 +36,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt index bd5af5d0ce0..0b0484537a4 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -14,9 +15,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt index 9980b8a1817..0f60747829b 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -16,9 +17,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt index c44b9b6be16..4a6114ece19 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -21,9 +22,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt index 8ae77da274a..1a3371842ab 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -21,9 +22,10 @@ suspend inline fun crossinlineMe(crossinline c1: suspend () -> Unit, crossinline } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt index 21d987accdf..589bd0a36ac 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt @@ -1,8 +1,9 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.intrinsics.* var i = 0; @@ -29,8 +30,9 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt index 4c71746a913..206f0711712 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -8,9 +9,10 @@ suspend inline fun crossinlineMe(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt b/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt index 9d37381c69a..a6bae77bbff 100644 --- a/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt +++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -12,9 +13,10 @@ suspend inline fun crossinlineMe2(crossinline c: suspend () -> Unit) { } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var result = "FAIL" var i = 0 diff --git a/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt b/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt index 5b84a506d4e..912b4d60d74 100644 --- a/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt +++ b/compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt @@ -1,4 +1,5 @@ // FILE: inlined.kt +// COMMON_COROUTINES_TEST // WITH_RUNTIME // NO_CHECK_LAMBDA_INLINING @@ -15,8 +16,9 @@ suspend inline fun crossinlineMe(crossinline c: suspend (String) -> String, cros } // FILE: inlineSite.kt +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun builder(c: suspend () -> Unit) { c.startCoroutine(object: Continuation { diff --git a/compiler/testData/codegen/bytecodeListing/coroutineContextIntrinsic.kt b/compiler/testData/codegen/bytecodeListing/coroutineContextIntrinsic.kt index 087f04a7268..78054e09eb5 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutineContextIntrinsic.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutineContextIntrinsic.kt @@ -1,3 +1,4 @@ +// !API_VERSION: 1.2 // WITH_RUNTIME import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.intrinsics.* diff --git a/compiler/testData/codegen/bytecodeListing/coroutineFields.kt b/compiler/testData/codegen/bytecodeListing/coroutineFields.kt index 5da9e969674..200dd6a59a9 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutineFields.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutineFields.kt @@ -1,6 +1,7 @@ // WITH_RUNTIME -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere() = suspendCoroutineOrReturn { x -> x.resume("OK") diff --git a/compiler/testData/codegen/bytecodeListing/coroutineFields.txt b/compiler/testData/codegen/bytecodeListing/coroutineFields.txt index a92a8b481f8..8276b0310dd 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutineFields.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutineFields.txt @@ -5,7 +5,7 @@ final class Controller$multipleSuspensions$1 { synthetic field exception: java.lang.Throwable synthetic final field this$0: Controller inner class Controller$multipleSuspensions$1 - method (p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void + method (p0: Controller, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -18,7 +18,7 @@ final class Controller$nonTailCall$1 { synthetic field exception: java.lang.Throwable synthetic final field this$0: Controller inner class Controller$nonTailCall$1 - method (p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void + method (p0: Controller, p1: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -29,10 +29,10 @@ public final class Controller { inner class Controller$multipleSuspensions$1 inner class Controller$nonTailCall$1 public method (): void - public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -43,11 +43,11 @@ final class CoroutineFieldsKt$box$1 { field L$1: java.lang.Object private field p$: Controller inner class CoroutineFieldsKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation - public synthetic method create(p0: java.lang.Object, p1: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation + method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation + public synthetic method create(p0: java.lang.Object, p1: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: Controller, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt b/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt index 65fc7529f1b..30419952e54 100644 --- a/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt +++ b/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt @@ -1,8 +1,9 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun some() {} diff --git a/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.txt b/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.txt index c14e82836da..302e1eca17f 100644 --- a/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.txt +++ b/compiler/testData/codegen/bytecodeListing/oomInReturnUnit.txt @@ -4,7 +4,7 @@ final class OomInReturnUnitKt$test$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class OomInReturnUnitKt$test$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -13,18 +13,18 @@ final class OomInReturnUnitKt$test$1 { @kotlin.Metadata public final class OomInReturnUnitKt { inner class OomInReturnUnitKt$test$1 - public final static @org.jetbrains.annotations.Nullable method some(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method some(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata public final class helpers/CoroutineUtilKt$handleExceptionContinuation$1 { synthetic final field $x: kotlin.jvm.functions.Function1 - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.EmptyCoroutineContext + private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.EmptyCoroutineContext inner class helpers/CoroutineUtilKt$handleExceptionContinuation$1 method (p0: kotlin.jvm.functions.Function1): void - public synthetic method getContext(): kotlin.coroutines.experimental.CoroutineContext - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.EmptyCoroutineContext + public synthetic method getContext(): COROUTINES_PACKAGE.CoroutineContext + public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.EmptyCoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -32,11 +32,11 @@ public final class helpers/CoroutineUtilKt$handleExceptionContinuation$1 { @kotlin.Metadata public final class helpers/CoroutineUtilKt$handleResultContinuation$1 { synthetic final field $x: kotlin.jvm.functions.Function1 - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.EmptyCoroutineContext + private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.EmptyCoroutineContext inner class helpers/CoroutineUtilKt$handleResultContinuation$1 method (p0: kotlin.jvm.functions.Function1): void - public synthetic method getContext(): kotlin.coroutines.experimental.CoroutineContext - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.EmptyCoroutineContext + public synthetic method getContext(): COROUTINES_PACKAGE.CoroutineContext + public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.EmptyCoroutineContext public method resume(p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -45,8 +45,8 @@ public final class helpers/CoroutineUtilKt$handleResultContinuation$1 { public final class helpers/CoroutineUtilKt { inner class helpers/CoroutineUtilKt$handleExceptionContinuation$1 inner class helpers/CoroutineUtilKt$handleResultContinuation$1 - public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation - public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation } @kotlin.Metadata @@ -59,13 +59,13 @@ public final class helpers/EmptyContinuation$Companion { @kotlin.Metadata public class helpers/EmptyContinuation { public final static field Companion: helpers.EmptyContinuation$Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.CoroutineContext inner class helpers/EmptyContinuation$Companion static method (): void public method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.CoroutineContext): void + public synthetic method (p0: COROUTINES_PACKAGE.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } diff --git a/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt b/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt index e5e5b5974af..89e4f357fe4 100644 --- a/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt +++ b/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt @@ -1,3 +1,4 @@ +// COMMON_COROUTINES_TEST // WITH_RUNTIME open class AbstractStuff() { diff --git a/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.txt b/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.txt index 7c0b32cfcee..014c0bc10ee 100644 --- a/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.txt +++ b/compiler/testData/codegen/bytecodeListing/suspendReifiedFun.txt @@ -1,11 +1,11 @@ @kotlin.Metadata public class AbstractStuff { public method (): void - private final method hello(p0: java.lang.Object, p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + private final method hello(p0: java.lang.Object, p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata public final class Stuff { public method (): void - public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt b/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt index 2db6f7e9522..f414a5326c5 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt @@ -1,6 +1,7 @@ // WITH_RUNTIME -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* var p: Int = 5846814 private suspend fun withoutInline() { diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.txt b/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.txt index e15f53eae48..2e3f0ce0941 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.txt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.txt @@ -4,7 +4,7 @@ final class TailCallIntrinsicsKt$withoutInline$c$1 { inner class TailCallIntrinsicsKt$withoutInline$c$1 static method (): void method (): void - public final @org.jetbrains.annotations.NotNull method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final @org.jetbrains.annotations.NotNull method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @@ -15,6 +15,6 @@ public final class TailCallIntrinsicsKt { static method (): void public final static method getP(): int public final static method setP(p0: int): void - synthetic final static @org.jetbrains.annotations.Nullable method withInline(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object - synthetic final static @org.jetbrains.annotations.Nullable method withoutInline(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + synthetic final static @org.jetbrains.annotations.Nullable method withInline(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + synthetic final static @org.jetbrains.annotations.Nullable method withoutInline(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt b/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt index 8dadb2eafc3..02d72204efb 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt @@ -1,3 +1,4 @@ +// COMMON_COROUTINES_TEST suspend fun empty() {} suspend fun withoutReturn() { empty() } suspend fun withReturn() { return empty() } diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.txt b/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.txt index 0b8e42d15f5..267efb20a2b 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.txt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.txt @@ -1,7 +1,7 @@ @kotlin.Metadata public final class Generic { public method (): void - public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -9,7 +9,7 @@ final class TailSuspendUnitFunKt$callsIntNotTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class TailSuspendUnitFunKt$callsIntNotTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -21,7 +21,7 @@ final class TailSuspendUnitFunKt$lambdaAsParameterNotTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class TailSuspendUnitFunKt$lambdaAsParameterNotTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -33,7 +33,7 @@ final class TailSuspendUnitFunKt$multipleExitPointsNotTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class TailSuspendUnitFunKt$multipleExitPointsNotTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -42,10 +42,11 @@ final class TailSuspendUnitFunKt$multipleExitPointsNotTailCall$1 { @kotlin.Metadata final class TailSuspendUnitFunKt$multipleExitPointsWhen$2 { inner class TailSuspendUnitFunKt$multipleExitPointsWhen$2 - method (p0: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + method (p0: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -53,7 +54,7 @@ final class TailSuspendUnitFunKt$notTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class TailSuspendUnitFunKt$notTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -74,7 +75,7 @@ final class TailSuspendUnitFunKt$useNullableUnit$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class TailSuspendUnitFunKt$useNullableUnit$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -89,27 +90,27 @@ public final class TailSuspendUnitFunKt { inner class TailSuspendUnitFunKt$notTailCall$1 inner class TailSuspendUnitFunKt$useGenericIngerType$2 inner class TailSuspendUnitFunKt$useNullableUnit$1 - public final static @org.jetbrains.annotations.Nullable method callsIntNotTailCall(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method empty(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method genericInferType(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method lambdaAsParameter(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterNotTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterReturn(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPoints(p0: boolean, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPointsNotTailCall(p0: boolean, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWhen(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWithOrdinaryInline(p0: boolean, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method nullableUnit(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method callsIntNotTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method empty(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method genericInferType(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method lambdaAsParameter(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterNotTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterReturn(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPoints(p0: boolean, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPointsNotTailCall(p0: boolean, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWhen(p0: int, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWithOrdinaryInline(p0: boolean, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method nullableUnit(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static method ordinary(): int public final static method ordinaryInline(): void - public final static @org.jetbrains.annotations.Nullable method returnsInt(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useGenericClass(@org.jetbrains.annotations.NotNull p0: Generic, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useGenericIngerType(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useGenericReturningUnit(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useNullableUnit(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useRunRunRunRunRun(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method withReturn(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method withoutReturn(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method returnsInt(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useGenericClass(@org.jetbrains.annotations.NotNull p0: Generic, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useGenericIngerType(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useGenericReturningUnit(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useNullableUnit(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useRunRunRunRunRun(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method withReturn(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method withoutReturn(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt b/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt index d4e43c52164..6e5dc7702b5 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt @@ -1,3 +1,4 @@ +// COMMON_COROUTINES_TEST suspend fun catchException(): String { try { return suspendWithException() diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.txt b/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.txt index 1460a54f81f..624495c572d 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.txt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.txt @@ -3,7 +3,7 @@ final class TryCatchTailCallKt$catchException$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class TryCatchTailCallKt$catchException$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -12,6 +12,6 @@ final class TryCatchTailCallKt$catchException$1 { @kotlin.Metadata public final class TryCatchTailCallKt { inner class TryCatchTailCallKt$catchException$1 - public final static @org.jetbrains.annotations.Nullable method catchException(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method catchException(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method suspendWithException(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt b/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt index cb5d8276f2d..bc00e7891b4 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt @@ -1,3 +1,4 @@ +// COMMON_COROUTINES_TEST suspend fun empty() {} suspend fun withoutReturn() { empty() diff --git a/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.txt b/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.txt index 0a507515788..02206956047 100644 --- a/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.txt +++ b/compiler/testData/codegen/bytecodeListing/tailcall/unreachable.txt @@ -1,7 +1,7 @@ @kotlin.Metadata public final class Generic { public method (): void - public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -9,7 +9,7 @@ final class UnreachableKt$callsIntNotTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class UnreachableKt$callsIntNotTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -21,7 +21,7 @@ final class UnreachableKt$lambdaAsParameterNotTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class UnreachableKt$lambdaAsParameterNotTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -33,7 +33,7 @@ final class UnreachableKt$multipleExitPointsNotTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class UnreachableKt$multipleExitPointsNotTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -42,10 +42,11 @@ final class UnreachableKt$multipleExitPointsNotTailCall$1 { @kotlin.Metadata final class UnreachableKt$multipleExitPointsWhen$2 { inner class UnreachableKt$multipleExitPointsWhen$2 - method (p0: kotlin.coroutines.experimental.Continuation): void - public final @org.jetbrains.annotations.Nullable method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + method (p0: COROUTINES_PACKAGE.Continuation): void + public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public synthetic method invoke(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -53,7 +54,7 @@ final class UnreachableKt$notTailCall$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class UnreachableKt$notTailCall$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -74,7 +75,7 @@ final class UnreachableKt$useNullableUnit$1 { synthetic field data: java.lang.Object synthetic field exception: java.lang.Throwable inner class UnreachableKt$useNullableUnit$1 - method (p0: kotlin.coroutines.experimental.Continuation): void + method (p0: COROUTINES_PACKAGE.Continuation): void public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object synthetic final method getLabel(): int synthetic final method setLabel(p0: int): void @@ -89,27 +90,27 @@ public final class UnreachableKt { inner class UnreachableKt$notTailCall$1 inner class UnreachableKt$useGenericInferType$2 inner class UnreachableKt$useNullableUnit$1 - public final static @org.jetbrains.annotations.Nullable method callsIntNotTailCall(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method empty(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method genericInferType(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method lambdaAsParameter(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterNotTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterReturn(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPoints(p0: boolean, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPointsNotTailCall(p0: boolean, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWhen(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWithOrdinaryInline(p0: boolean, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method nullableUnit(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method callsIntNotTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method empty(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method genericInferType(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method lambdaAsParameter(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterNotTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method lambdaAsParameterReturn(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPoints(p0: boolean, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPointsNotTailCall(p0: boolean, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWhen(p0: int, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method multipleExitPointsWithOrdinaryInline(p0: boolean, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method nullableUnit(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static method ordinary(): int public final static method ordinaryInline(): void - public final static @org.jetbrains.annotations.Nullable method returnsInt(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method twoReturns(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useGenericClass(@org.jetbrains.annotations.NotNull p0: Generic, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useGenericInferType(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useGenericReturningUnit(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useNullableUnit(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method useRunRunRunRunRun(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method withoutReturn(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method returnsInt(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method twoReturns(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useGenericClass(@org.jetbrains.annotations.NotNull p0: Generic, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useGenericInferType(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useGenericReturningUnit(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useNullableUnit(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method useRunRunRunRunRun(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method withoutReturn(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeText/constCoroutine.kt b/compiler/testData/codegen/bytecodeText/constCoroutine.kt index ba21f2939e7..1bb0a24730b 100644 --- a/compiler/testData/codegen/bytecodeText/constCoroutine.kt +++ b/compiler/testData/codegen/bytecodeText/constCoroutine.kt @@ -1,3 +1,4 @@ +// !API_VERSION: 1.2 // WITH_RUNTIME // WITH_COROUTINES import helpers.* diff --git a/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt b/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt index 7fbb856a110..4b15b8cba1f 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") } diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt index 66fb3b668b6..8a64cae1d2a 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt index 10ca2521b92..f2d336b1ec8 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt index 1e445cca764..22c07a07061 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt index bc12c12ac5e..43977b93afe 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt index 15a232015f9..bfd6710fda0 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt index 8a218104ec8..a9946e6a63b 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt index 7e9a13076b3..6b32ccf5093 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt @@ -1,10 +1,11 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE // TARGET_BACKEND: JVM -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt index 414e826aa58..e96740e272c 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt index e9874d4483d..ef494c8c775 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt @@ -1,10 +1,11 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE // TARGET_BACKEND: JVM -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt index 6f8a8ab3492..369f44ae849 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere(): Unit = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt b/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt index 4489c2cc4e4..3beb2dae37c 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* // TREAT_AS_ONE_FILE var res = "FAIL" diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt index d59a6ecf239..796c4e33fe9 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") } diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt index 88f1393918c..3a264dd4af9 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // WITH_COROUTINES import helpers.* // TREAT_AS_ONE_FILE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendHere(): String = suspendCoroutineOrReturn { x -> x.resume("OK") } diff --git a/compiler/testData/codegen/java8/box/async.kt b/compiler/testData/codegen/java8/box/async.kt index 5b6296c13a4..c79a48238e0 100644 --- a/compiler/testData/codegen/java8/box/async.kt +++ b/compiler/testData/codegen/java8/box/async.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // FULL_JDK import java.util.concurrent.CompletableFuture -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun foo(): CompletableFuture = CompletableFuture.supplyAsync { "foo" } fun bar(v: String): CompletableFuture = CompletableFuture.supplyAsync { "bar with $v" } diff --git a/compiler/testData/codegen/java8/box/asyncException.kt b/compiler/testData/codegen/java8/box/asyncException.kt index 636ea99c98b..f472ca4e230 100644 --- a/compiler/testData/codegen/java8/box/asyncException.kt +++ b/compiler/testData/codegen/java8/box/asyncException.kt @@ -1,9 +1,10 @@ // WITH_RUNTIME +// COMMON_COROUTINES_TEST // FULL_JDK import java.util.concurrent.CompletableFuture -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun exception(v: String): CompletableFuture = CompletableFuture.supplyAsync { throw RuntimeException(v) } diff --git a/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt b/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt index e42511c5ff8..d4376077edc 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/overrideDefaultArgument.txt @@ -1,18 +1,18 @@ @kotlin.Metadata public final class CoroutineUtilKt { - public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation - public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.CoroutineContext): void + public synthetic method (p0: COROUTINES_PACKAGE.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -26,20 +26,20 @@ public final static class EmptyContinuation/Companion { @kotlin.Metadata public interface I { inner class I/DefaultImpls - public abstract @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public abstract @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata public final class I/DefaultImpls { inner class I/DefaultImpls - public synthetic static method foo$default(p0: I, p1: java.lang.String, p2: kotlin.coroutines.experimental.Continuation, p3: int, p4: java.lang.Object): java.lang.Object + public synthetic static method foo$default(p0: I, p1: java.lang.String, p2: COROUTINES_PACKAGE.Continuation, p3: int, p4: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class O { public final static field INSTANCE: O private method (): void - public @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object } @kotlin.Metadata @@ -56,5 +56,5 @@ public final class OverrideDefaultArgumentKt { public final static method setFinished(p0: boolean): void public final static method setProceed(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void public final static method setResult(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final static @org.jetbrains.annotations.Nullable method sleep(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method sleep(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt index 6d51aa80456..1e83fca8d6f 100644 --- a/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt +++ b/compiler/testData/codegen/light-analysis/coroutines/tailOperations/tailInlining.txt @@ -1,18 +1,18 @@ @kotlin.Metadata public final class CoroutineUtilKt { - public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation - public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation + public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation + public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): COROUTINES_PACKAGE.Continuation } @kotlin.Metadata public class EmptyContinuation { public final static field Companion: EmptyContinuation.Companion - private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext + private final @org.jetbrains.annotations.NotNull field context: COROUTINES_PACKAGE.CoroutineContext inner class EmptyContinuation/Companion public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method (): void - public method (@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void - public synthetic method (p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext + public method (@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.CoroutineContext): void + public synthetic method (p0: COROUTINES_PACKAGE.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void + public @org.jetbrains.annotations.NotNull method getContext(): COROUTINES_PACKAGE.CoroutineContext public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void } @@ -29,9 +29,9 @@ public final class TailInliningKt { private static @org.jetbrains.annotations.NotNull field proceed: kotlin.jvm.functions.Function0 private static @org.jetbrains.annotations.NotNull field result: java.lang.String public final static method async(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - public final static @org.jetbrains.annotations.Nullable method bar(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method bar(p0: int, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static @org.jetbrains.annotations.Nullable method foo(p0: int, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object + public final static @org.jetbrains.annotations.Nullable method foo(p0: int, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object public final static method getFinished(): boolean public final static @org.jetbrains.annotations.NotNull method getProceed(): kotlin.jvm.functions.Function0 public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String diff --git a/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt b/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt index 1458cde1c16..ee20c519714 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt @@ -1,10 +1,11 @@ // IGNORE_BACKEND: NATIVE +// COMMON_COROUTINES_TEST // FILE: A.kt // WITH_RUNTIME package a -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun suspendHere() = suspendCoroutineOrReturn { x -> diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt index 330e543cc9b..2459828e9a6 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt index 114db3b7434..580cb24ce37 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt index 771a531a533..caf54fde21b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt index ccc8427a5f2..ad2aa59fa1a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt index 1f53c820408..f479a760450 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt index fdbfa47f96d..7da31003c9c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -UNUSED_PARAMETER +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt index f89c578edbd..0ab453fa8ef 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt index 378d02bbec5..632b19a4b4e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt index efc20b60e77..964edd27623 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt index fd6c2de1951..6503c38adef 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -NOTHING_TO_INLINE -UNUSED_PARAMETER +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt index 272469e90af..2ca6ed85377 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt index 9dc2ebb8a68..79aeff053bc 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -NOTHING_TO_INLINE +// COMMON_COROUTINES_TEST // SKIP_TXT -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* open class EmptyContinuation(override val context: CoroutineContext = EmptyCoroutineContext) : Continuation { companion object : EmptyContinuation() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt index dde70ae1ba9..465f7f1115e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt @@ -1,7 +1,8 @@ // SKIP_TXT // WITH_RUNTIME +// COMMON_COROUTINES_TEST -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* interface Job : CoroutineContext.Element {} interface Deferred : Job { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt index 36a07498462..fdce1581313 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt @@ -1,8 +1,9 @@ // FILE: 1.kt +// COMMON_COROUTINES_TEST fun test(c: Continuation) {} // FILE: 2.kt -import kotlin.coroutines.experimental.* +import COROUTINES_PACKAGE.* fun test2(c: Continuation) {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt index 0567130d814..2f46b37d932 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt @@ -1,4 +1,4 @@ package public fun test(/*0*/ c: [ERROR : Continuation]): kotlin.Unit -public fun test2(/*0*/ c: kotlin.coroutines.experimental.Continuation): kotlin.Unit +public fun test2(/*0*/ c: COROUTINES_PACKAGE.Continuation): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt index 226f4e72e45..6821e1eb87d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt @@ -1,11 +1,12 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE +// COMMON_COROUTINES_TEST interface SuperInterface { suspend fun superFun() {} suspend fun String.superExtFun() {} } -@kotlin.coroutines.experimental.RestrictsSuspension +@COROUTINES_PACKAGE.RestrictsSuspension open class RestrictedController : SuperInterface { suspend fun memberFun() {} suspend fun String.memberExtFun() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt index 9a8eed4e1da..05e1c15bce4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt @@ -5,7 +5,7 @@ public fun generate2(/*0*/ f: suspend RestrictedController.() -> kotlin.Unit): k public fun generate3(/*0*/ f: suspend SubClass.() -> kotlin.Unit): kotlin.Unit public fun kotlin.String.test(): kotlin.Unit -@kotlin.coroutines.experimental.RestrictsSuspension public open class RestrictedController : SuperInterface { +@COROUTINES_PACKAGE.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt index 40f5d49687e..1a0b91f8110 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt @@ -1,8 +1,9 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE +// COMMON_COROUTINES_TEST interface SuperInterface -@kotlin.coroutines.experimental.RestrictsSuspension +@COROUTINES_PACKAGE.RestrictsSuspension open class RestrictedController : SuperInterface class SubClass : RestrictedController() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt index 2512aab6d8c..353c47b3963 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.txt @@ -20,7 +20,7 @@ public final class A { public final suspend fun SuperInterface.memExtSuper(): kotlin.Unit } -@kotlin.coroutines.experimental.RestrictsSuspension public open class RestrictedController : SuperInterface { +@COROUTINES_PACKAGE.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt index 42fa77742b0..af76adccd60 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt @@ -1,8 +1,9 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE +// COMMON_COROUTINES_TEST interface SuperInterface -@kotlin.coroutines.experimental.RestrictsSuspension +@COROUTINES_PACKAGE.RestrictsSuspension open class RestrictedController : SuperInterface class SubClass : RestrictedController() diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt index 8130b88e034..141a4745877 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.txt @@ -14,7 +14,7 @@ public final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@kotlin.coroutines.experimental.RestrictsSuspension public open class RestrictedController : SuperInterface { +@COROUTINES_PACKAGE.RestrictsSuspension public open class RestrictedController : SuperInterface { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt index b7bfba29cfc..6dfbfcf511b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt @@ -1,6 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -SUSPENSION_CALL_MUST_BE_USED_AS_RETURN_VALUE +// COMMON_COROUTINES_TEST -@kotlin.coroutines.experimental.RestrictsSuspension +@COROUTINES_PACKAGE.RestrictsSuspension class RestrictedController { suspend fun member() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt index 08a056a217f..476846c3b2f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.txt @@ -5,7 +5,7 @@ public fun test(): kotlin.Unit public suspend fun RestrictedController.extension(): kotlin.Unit public suspend fun RestrictedController.l(): kotlin.Unit -@kotlin.coroutines.experimental.RestrictsSuspension public final class RestrictedController { +@COROUTINES_PACKAGE.RestrictsSuspension public final class RestrictedController { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt index 594d867359a..41ad0852a44 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt @@ -1,4 +1,5 @@ -@kotlin.coroutines.experimental.RestrictsSuspension +// COMMON_COROUTINES_TEST +@COROUTINES_PACKAGE.RestrictsSuspension class RestrictedController suspend fun Any?.extFun() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt index 1818a3714c9..0ceda5dab23 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.txt @@ -5,7 +5,7 @@ public suspend fun suspendFun(): kotlin.Unit public fun test(): kotlin.Unit public suspend fun kotlin.Any?.extFun(): kotlin.Unit -@kotlin.coroutines.experimental.RestrictsSuspension public final class RestrictedController { +@COROUTINES_PACKAGE.RestrictsSuspension public final class RestrictedController { public constructor RestrictedController() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt index e083cbb3232..39b3b622924 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt @@ -1,5 +1,6 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -NOTHING_TO_INLINE -import kotlin.coroutines.experimental.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* suspend fun notMember(q: Double) = 1 diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt index 0f980ff4df0..8b482a8a964 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt @@ -10,7 +10,7 @@ public final class Controller { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final suspend inline fun inlineFun(/*0*/ x: kotlin.Int): kotlin.Unit public final suspend fun noParameters(): kotlin.Unit - public final suspend fun oldConvention(/*0*/ x: kotlin.coroutines.experimental.Continuation): kotlin.Unit + public final suspend fun oldConvention(/*0*/ x: COROUTINES_PACKAGE.Continuation): kotlin.Unit public final suspend fun oneParameter(/*0*/ q: kotlin.Any): kotlin.Unit public final suspend fun returnsString(/*0*/ q: kotlin.Any): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt index 75ab7d94f68..689a8213a81 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt @@ -1,7 +1,8 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER // !CHECK_TYPE -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* class Controller { suspend fun noParams(): Unit = suspendCoroutineOrReturn { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt index d244c9247be..bcd8ad1955d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt @@ -1,6 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER // !CHECK_TYPE -import kotlin.coroutines.experimental.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* class Controller { suspend fun noParams() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt index d6c138e74dc..6a6a3ec3b4f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt @@ -1,6 +1,7 @@ // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun nonSuspend() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt index 4f5b7e41fc8..8acf90ead7d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt @@ -1,6 +1,7 @@ // Tail calls are not allowed to be Nothing typed. See KT-15051 -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun suspendLogAndThrow(exception: Throwable): Nothing = suspendCoroutineOrReturn { c -> c.resumeWithException(exception) diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt index 5bf72ee8526..e98e41f2b57 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt @@ -1,6 +1,7 @@ // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* fun nonSuspend() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt index 8d21ea13b81..85516b35e57 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt @@ -1,6 +1,7 @@ // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +// COMMON_COROUTINES_TEST +import COROUTINES_PACKAGE.* +import COROUTINES_PACKAGE.intrinsics.* suspend fun baz() = 1 diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt index 8ba81ecde41..3fe6bda159f 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.asJava @@ -28,7 +17,6 @@ import java.util.regex.Pattern object LightClassTestCommon { private val SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE) - @JvmOverloads fun testLightClass( expectedFile: File, testDataFile: File, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt index 052d5b04aac..ca4677685db 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.checkers @@ -99,7 +88,14 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { val oldModule = modules[testModule]!! - val languageVersionSettings = loadLanguageVersionSettings(testFilesInModule) + val languageVersionSettings = + if (coroutinesPackage.isNotEmpty()) + CompilerTestLanguageVersionSettings( + DEFAULT_DIAGNOSTIC_TESTS_FEATURES, + if (coroutinesPackage.contains("experimental")) ApiVersion.KOTLIN_1_2 else ApiVersion.KOTLIN_1_3, + if (coroutinesPackage.contains("experimental")) LanguageVersion.KOTLIN_1_2 else LanguageVersion.KOTLIN_1_3 + ) + else loadLanguageVersionSettings(testFilesInModule) val moduleContext = context.withProject(project).withModule(oldModule) val separateModules = groupedByModule.size == 1 && groupedByModule.keys.single() == null @@ -141,7 +137,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { var exceptionFromDescriptorValidation: Throwable? = null try { val expectedFile = getExpectedDescriptorFile(testDataFile, files) - validateAndCompareDescriptorWithFile(expectedFile, files, modules) + validateAndCompareDescriptorWithFile(expectedFile, files, modules, coroutinesPackage) } catch (e: Throwable) { exceptionFromDescriptorValidation = e } @@ -175,7 +171,9 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { exceptionFromDynamicCallDescriptorsValidation = e } - KotlinTestUtils.assertEqualsToFile(getExpectedDiagnosticsFile(testDataFile), actualText.toString()) + KotlinTestUtils.assertEqualsToFile(getExpectedDiagnosticsFile(testDataFile), actualText.toString()) { s -> + s.replace("COROUTINES_PACKAGE", coroutinesPackage) + } assertTrue("Diagnostics mismatch. See the output above", ok) @@ -395,7 +393,8 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { private fun validateAndCompareDescriptorWithFile( expectedFile: File, testFiles: List, - modules: Map + modules: Map, + coroutinesPackage: String ) { if (skipDescriptorsValidation()) return if (testFiles.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_TXT") }) { @@ -456,7 +455,9 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { "Such tests are hard to maintain, take long time to execute and are subject to sudden unreviewed changes anyway." } - KotlinTestUtils.assertEqualsToFile(expectedFile, allPackagesText) + KotlinTestUtils.assertEqualsToFile(expectedFile, allPackagesText) { s -> + s.replace("COROUTINES_PACKAGE", coroutinesPackage) + } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java index dd6b8e8d2fa..32f91d5eb4a 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.checkers; @@ -41,6 +30,7 @@ import java.util.*; public abstract class KotlinMultiFileTestWithJava extends KtUsefulTestCase { protected File javaFilesDir; private File kotlinSourceRoot; + protected String coroutinesPackage; @Override public void setUp() throws Exception { @@ -50,6 +40,7 @@ public abstract class KotlinMultiFileTestWithJava extends KtUsefulTestCase if (isKotlinSourceRootNeeded()) { kotlinSourceRoot = KotlinTestUtils.tmpDir("kotlin-src"); } + coroutinesPackage = ""; } @Override @@ -147,6 +138,17 @@ public abstract class KotlinMultiFileTestWithJava extends KtUsefulTestCase doMultiFileTest(file, modules, testFiles); } + protected void doTestWithCoroutinesPackageReplacement(String filePath, String coroutinesPackage) throws Exception { + File file = new File(filePath); + String expectedText = KotlinTestUtils.doLoadFile(file); + expectedText = expectedText.replace("COROUTINES_PACKAGE", coroutinesPackage); + this.coroutinesPackage = coroutinesPackage; + Map modules = new HashMap<>(); + List testFiles = createTestFiles(file, expectedText, modules); + + doMultiFileTest(file, modules, testFiles); + } + protected abstract M createTestModule(@NotNull String name); protected abstract F createTestFile(M module, String fileName, String text, Map directives); @@ -187,7 +189,7 @@ public abstract class KotlinMultiFileTestWithJava extends KtUsefulTestCase KotlinTestUtils.mkdirs(file.getParentFile()); FilesKt.writeText(file, content, Charsets.UTF_8); } - }); + }, coroutinesPackage); } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java index 20134f0b0d4..1e68dc3d464 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen; @@ -38,7 +27,11 @@ import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.getGene public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { @Override - protected void doMultiFileTest(@NotNull File wholeFile, @NotNull List files, @Nullable File javaFilesDir) throws Exception { + protected void doMultiFileTest( + @NotNull File wholeFile, + @NotNull List files, + @Nullable File javaFilesDir + ) throws Exception { try { compile(files, javaFilesDir); blackBox(); @@ -87,7 +80,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { } ); - assertEqualsToFile(expectedFile, text); + assertEqualsToFile(expectedFile, text, s -> s.replace("COROUTINES_PACKAGE", coroutinesPackage)); } protected void blackBox() { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt index 570c6d99f96..2002d9096c2 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen @@ -26,7 +15,9 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() { val txtFile = File(wholeFile.parentFile, wholeFile.nameWithoutExtension + ".txt") compile(files, javaFilesDir) val actualTxt = BytecodeListingTextCollectingVisitor.getText(classFileFactory, withSignatures = isWithSignatures(wholeFile)) - KotlinTestUtils.assertEqualsToFile(txtFile, actualTxt) + KotlinTestUtils.assertEqualsToFile(txtFile, actualTxt) { + it.replace("COROUTINES_PACKAGE", coroutinesPackage) + } } private fun isWithSignatures(wholeFile: File): Boolean = diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt index a2eed17a080..22d710c8878 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen @@ -31,7 +20,7 @@ abstract class AbstractBytecodeTextTest : CodegenTestCase() { @Throws(Exception::class) override fun doMultiFileTest(wholeFile: File, files: List, javaFilesDir: File?) { - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL, files, javaFilesDir) + createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL, files, coroutinesPackage, javaFilesDir) loadMultiFiles(files) if (isMultiFileTest(files) && !InTextDirectivesUtils.isDirectiveDefined(wholeFile.readText(), "TREAT_AS_ONE_FILE")) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java index b630e11c567..9334145e4b8 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen; diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt index 45a30fd5516..f0b82b62605 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen @@ -31,7 +20,9 @@ abstract class AbstractDumpDeclarationsTest : CodegenTestCase() { dumpToFile = KotlinTestUtils.tmpDirForTest(this).resolve(name + ".json") compile(files, null) classFileFactory.generationState.destroy() - KotlinTestUtils.assertEqualsToFile(expectedResult, dumpToFile.readText()) + KotlinTestUtils.assertEqualsToFile(expectedResult, dumpToFile.readText()) { + it.replace("COROUTINES_PACKAGE", coroutinesPackage) + } } override fun updateConfiguration(configuration: CompilerConfiguration) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt index 0afc8e1e4d3..a6df8f053e2 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index cdcc567921f..31774af83bb 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen; @@ -99,6 +88,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected GeneratedClassLoader initializedClassLoader; protected File javaClassesOutputDirectory = null; protected List additionalDependencies = null; + protected String coroutinesPackage; protected ConfigurationKind configurationKind = ConfigurationKind.JDK_ONLY; private final String defaultJvmTarget = System.getProperty(DEFAULT_JVM_TARGET_FOR_TEST); @@ -109,7 +99,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { @NotNull ConfigurationKind configurationKind, @Nullable File... javaSourceRoots ) { - createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), javaSourceRoots); + createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), "" , javaSourceRoots); } @NotNull @@ -125,6 +115,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected final void createEnvironmentWithMockJdkAndIdeaAnnotations( @NotNull ConfigurationKind configurationKind, @NotNull List testFilesWithConfigurationDirectives, + @NotNull String coroutinesPackage, @Nullable File... javaSourceRoots ) { if (myEnvironment != null) { @@ -154,7 +145,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { ) { CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(kind, jdkKind, classpath, javaSource); - updateConfigurationByDirectivesInTestFiles(testFilesWithConfigurationDirectives, configuration); + updateConfigurationByDirectivesInTestFiles(testFilesWithConfigurationDirectives, configuration, coroutinesPackage); updateConfiguration(configuration); setCustomDefaultJvmTarget(configuration); @@ -163,7 +154,8 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected static void updateConfigurationByDirectivesInTestFiles( @NotNull List testFilesWithConfigurationDirectives, - @NotNull CompilerConfiguration configuration + @NotNull CompilerConfiguration configuration, + @NotNull String coroutinesPackage ) { LanguageVersionSettings explicitLanguageVersionSettings = null; LanguageVersion explicitLanguageVersion = null; @@ -185,6 +177,16 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { assertDirectivesToNull(explicitLanguageVersionSettings, explicitLanguageVersion); explicitLanguageVersion = LanguageVersion.fromVersionString(version); } + if (!InTextDirectivesUtils.findLinesWithPrefixesRemoved(testFile.content, "// COMMON_COROUTINES_TEST").isEmpty()) { + assert(!testFile.content.contains("COROUTINES_PACKAGE")) : "Must replace COROUTINES_PACKAGE prior to tests compilation"; + if (!coroutinesPackage.isEmpty()) { + if (coroutinesPackage.equals("kotlin.coroutines.experimental")) { + explicitLanguageVersion = LanguageVersion.KOTLIN_1_2; + } else { + explicitLanguageVersion = LanguageVersion.KOTLIN_1_3; + } + } + } Map directives = KotlinTestUtils.parseDirectives(testFile.content); LanguageVersionSettings fileLanguageVersionSettings = parseLanguageVersionSettings(directives); @@ -291,6 +293,12 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { } } + @Override + protected void setUp() throws Exception { + coroutinesPackage = ""; + super.setUp(); + } + @Override protected void tearDown() throws Exception { myFiles = null; @@ -388,8 +396,11 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected GeneratedClassLoader createClassLoader() { return new GeneratedClassLoader( generateClassesInFile(), - configurationKind.getWithReflection() ? ForTestCompileRuntime.runtimeAndReflectJarClassLoader() - : ForTestCompileRuntime.runtimeJarClassLoader(), + configurationKind.getWithReflection() + ? ForTestCompileRuntime.runtimeAndReflectJarClassLoader() + : configurationKind.getWithCoroutines() + ? ForTestCompileRuntime.runtimeAndCoroutinesJarClassLoader() + : ForTestCompileRuntime.runtimeJarClassLoader(), getClassPathURLs() ); } @@ -641,6 +652,9 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { if (loadAndroidAnnotations) { javaClasspath.add(ForTestCompileRuntime.androidAnnotationsForTests().getPath()); } + if (configurationKind.getWithCoroutines()) { + javaClasspath.add(ForTestCompileRuntime.coroutinesJarForTests().getPath()); + } javaClassesOutputDirectory = CodegenTestUtil.compileJava( findJavaSourcesInDirectory(javaSourceDir), javaClasspath, javacOptions @@ -652,7 +666,11 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { protected ConfigurationKind extractConfigurationKind(@NotNull List files) { boolean addRuntime = false; boolean addReflect = false; + boolean addCoroutines = false; for (TestFile file : files) { + if (InTextDirectivesUtils.isDirectiveDefined(file.content, "COMMON_COROUTINES_TEST")) { + addCoroutines = true; + } if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) { addRuntime = true; } @@ -661,7 +679,9 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { } } - return addReflect ? ConfigurationKind.ALL : + return (addReflect && addCoroutines) ? ConfigurationKind.ALL : + addReflect ? ConfigurationKind.WITH_REFLECT : + addCoroutines ? ConfigurationKind.WITH_COROUTINES : addRuntime ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.JDK_ONLY; } @@ -720,13 +740,25 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { String expectedText = KotlinTestUtils.doLoadFile(file); Ref javaFilesDir = Ref.create(); - List testFiles = createTestFiles(file, expectedText, javaFilesDir); + List testFiles = createTestFiles(file, expectedText, javaFilesDir, ""); + + doMultiFileTest(file, testFiles, javaFilesDir.get()); + } + + protected void doTestWithCoroutinesPackageReplacement(String filePath, String packageName) throws Exception { + File file = new File(filePath); + String expectedText = KotlinTestUtils.doLoadFile(file); + expectedText = expectedText.replace("COROUTINES_PACKAGE", packageName); + this.coroutinesPackage = packageName; + Ref javaFilesDir = Ref.create(); + + List testFiles = createTestFiles(file, expectedText, javaFilesDir, coroutinesPackage); doMultiFileTest(file, testFiles, javaFilesDir.get()); } @NotNull - private static List createTestFiles(File file, String expectedText, Ref javaFilesDir) { + private static List createTestFiles(File file, String expectedText, Ref javaFilesDir, String coroutinesPackage) { return KotlinTestUtils.createTestFiles(file.getName(), expectedText, new KotlinTestUtils.TestFileFactoryNoModules() { @NotNull @Override @@ -751,10 +783,14 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { KotlinTestUtils.mkdirs(file.getParentFile()); FilesKt.writeText(file, content, Charsets.UTF_8); } - }); + }, coroutinesPackage); } - protected void doMultiFileTest(@NotNull File wholeFile, @NotNull List files, @Nullable File javaFilesDir) throws Exception { + protected void doMultiFileTest( + @NotNull File wholeFile, + @NotNull List files, + @Nullable File javaFilesDir + ) throws Exception { throw new UnsupportedOperationException("Multi-file test cases are not supported in this test"); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java index ec9d6012909..b754f25fdcc 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.codegen.forTestCompile; @@ -30,12 +19,18 @@ import java.util.List; public class ForTestCompileRuntime { private static volatile SoftReference reflectJarClassLoader = new SoftReference<>(null); private static volatile SoftReference runtimeJarClassLoader = new SoftReference<>(null); + private static volatile SoftReference coroutinesJarClassLoader = new SoftReference<>(null); @NotNull public static File runtimeJarForTests() { return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib.jar")); } + @NotNull + public static File coroutinesJarForTests() { + return assertExists(new File("dist/kotlin-stdlib-coroutines.jar")); + } + @NotNull public static File minimalRuntimeJarForTests() { return assertExists(new File("dist/kotlin-stdlib-minimal-for-test.jar")); @@ -93,12 +88,23 @@ public class ForTestCompileRuntime { public static synchronized ClassLoader runtimeAndReflectJarClassLoader() { ClassLoader loader = reflectJarClassLoader.get(); if (loader == null) { - loader = createClassLoader(runtimeJarForTests(), reflectJarForTests(), scriptRuntimeJarForTests(), kotlinTestJarForTests()); + loader = createClassLoader(runtimeJarForTests(), coroutinesJarForTests(), reflectJarForTests(), scriptRuntimeJarForTests(), + kotlinTestJarForTests()); reflectJarClassLoader = new SoftReference<>(loader); } return loader; } + @NotNull + public static synchronized ClassLoader runtimeAndCoroutinesJarClassLoader() { + ClassLoader loader = coroutinesJarClassLoader.get(); + if (loader == null) { + loader = createClassLoader(runtimeJarForTests(), coroutinesJarForTests(), scriptRuntimeJarForTests(), kotlinTestJarForTests()); + coroutinesJarClassLoader = new SoftReference<>(loader); + } + return loader; + } + @NotNull public static synchronized ClassLoader runtimeJarClassLoader() { ClassLoader loader = runtimeJarClassLoader.get(); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index 6148815ff4c..6b3c5595bb0 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.jvm.compiler; @@ -280,7 +269,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { } return targetFile; } - }); + }, ""); Pair javaPackageAndContext = compileJavaAndLoadTestPackageAndBindingContextFromBinary( srcFiles, compiledDir, ConfigurationKind.ALL diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java index 158d10aef24..e3698cdc2c5 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.resolve; @@ -59,7 +48,7 @@ public abstract class ExtensibleResolveTestCase extends KotlinTestWithEnvironmen public KtFile create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { return expectedResolveData.createFileFromMarkedUpText(fileName, text); } - }); + }, ""); expectedResolveData.checkResult(ExpectedResolveData.analyze(files, getEnvironment())); } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt index 8cefeaabdbf..a8afa9d8c33 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.test @@ -19,7 +8,8 @@ package org.jetbrains.kotlin.test enum class ConfigurationKind( val withRuntime: Boolean = false, val withMockRuntime: Boolean = false, - val withReflection: Boolean = false + val withReflection: Boolean = false, + val withCoroutines: Boolean = false ) { /** JDK without any kotlin runtime */ JDK_NO_RUNTIME(), @@ -27,6 +17,10 @@ enum class ConfigurationKind( JDK_ONLY(withMockRuntime = true), /** JDK + kotlin runtime but without reflection */ NO_KOTLIN_REFLECT(withRuntime = true), + /** JDK + kotlin runtime + coroutines */ + WITH_COROUTINES(withCoroutines = true, withRuntime = true), /** JDK + kotlin runtime + kotlin reflection */ - ALL(withRuntime = true, withReflection = true), + WITH_REFLECT(withRuntime = true, withReflection = true), + /** JDK + kotlin runtime + kotlin reflection + coroutines*/ + ALL(withRuntime = true, withReflection = true, withCoroutines = true) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 830f49a46e0..066d0d7ee37 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -568,6 +568,9 @@ public class KotlinTestUtils { configuration.put(JVMConfigurationKeys.JDK_HOME, new File(System.getProperty("java.home"))); } + if (configurationKind.getWithCoroutines()) { + JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.coroutinesJarForTests()); + } if (configurationKind.getWithRuntime()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.scriptRuntimeJarForTests()); @@ -709,13 +712,13 @@ public class KotlinTestUtils { } @NotNull - public static List createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory factory) { - return createTestFiles(testFileName, expectedText, factory, false); + public static List createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory factory, String coroutinesPackage) { + return createTestFiles(testFileName, expectedText, factory, false, coroutinesPackage); } @NotNull public static List createTestFiles(String testFileName, String expectedText, TestFileFactory factory, - boolean preserveLocations) { + boolean preserveLocations, String coroutinesPackage) { Map directives = parseDirectives(expectedText); List testFiles = Lists.newArrayList(); @@ -768,10 +771,13 @@ public class KotlinTestUtils { if (isDirectiveDefined(expectedText, "WITH_COROUTINES")) { M supportModule = hasModules ? factory.createModule("support", Collections.emptyList(), Collections.emptyList()) : null; + if (coroutinesPackage.isEmpty()) { + coroutinesPackage = "kotlin.coroutines.experimental"; + } testFiles.add(factory.createFile(supportModule, "CoroutineUtil.kt", "package helpers\n" + - "import kotlin.coroutines.experimental.*\n" + + "import " + coroutinesPackage + ".*\n" + "fun handleResultContinuation(x: (T) -> Unit): Continuation = object: Continuation {\n" + " override val context = EmptyCoroutineContext\n" + " override fun resumeWithException(exception: Throwable) {\n" + @@ -862,7 +868,7 @@ public class KotlinTestUtils { int firstLineEnd = text.indexOf('\n'); return StringUtil.trimTrailing(text.substring(firstLineEnd + 1)); } - }); + }, ""); Assert.assertTrue("Exactly two files expected: ", files.size() == 2); diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index ee512c7ade9..d6ff003c4ce 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -3743,8 +3743,15 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("withCoroutines.kt") - public void testWithCoroutines() throws Exception { - runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + public void testWithCoroutines_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5058,402 +5065,955 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + public void test32defaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("32defaultParametersInSuspend.kt") + public void test32defaultParametersInSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + public void testAccessorForSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("accessorForSuspend.kt") + public void testAccessorForSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); } - @TestMetadata("asyncIterator.kt") - public void testAsyncIterator() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + @TestMetadata("asyncIteratorNullMerge.kt") + public void testAsyncIteratorNullMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("asyncIteratorNullMerge.kt") - public void testAsyncIteratorNullMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + public void testAsyncIteratorNullMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("asyncIteratorToList.kt") - public void testAsyncIteratorToList() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + public void testAsyncIteratorToList_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIteratorToList.kt") + public void testAsyncIteratorToList_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("await.kt") - public void testAwait() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/await.kt"); + public void testAwait_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("beginWithException.kt") - public void testBeginWithException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + @TestMetadata("await.kt") + public void testAwait_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + public void testBeginWithExceptionNoHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + public void testCoercionToUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coercionToUnit.kt") + public void testCoercionToUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + public void testControllerAccessFromInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controllerAccessFromInnerLambda.kt") + public void testControllerAccessFromInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + public void testCoroutineContextInInlinedLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineContextInInlinedLambda.kt") + public void testCoroutineContextInInlinedLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineToString.kt") - public void testCoroutineToString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + public void testCoroutineToString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineToString.kt") + public void testCoroutineToString_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + public void testCreateCoroutineSafe_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("createCoroutineSafe.kt") + public void testCreateCoroutineSafe_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + public void testCreateCoroutinesOnManualInstances_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("createCoroutinesOnManualInstances.kt") + public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + public void testCrossInlineWithCapturedOuterReceiver_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") + public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + public void testDefaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("dispatchResume.kt") + public void testDispatchResume_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + public void testEmptyClosure_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("emptyClosure.kt") + public void testEmptyClosure_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + public void testFalseUnitCoercion_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("falseUnitCoercion.kt") + public void testFalseUnitCoercion_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("generate.kt") - public void testGenerate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/generate.kt"); + public void testGenerate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("generate.kt") + public void testGenerate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleException.kt") + public void testHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + public void testHandleResultCallEmptyBody_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultCallEmptyBody.kt") + public void testHandleResultCallEmptyBody_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + public void testHandleResultNonUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultNonUnitExpression.kt") + public void testHandleResultNonUnitExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + public void testHandleResultSuspended_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultSuspended.kt") + public void testHandleResultSuspended_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("illegalState.kt") - public void testIllegalState() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/illegalState.kt"); + public void testIllegalState_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/illegalState.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("illegalState.kt") + public void testIllegalState_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/illegalState.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + public void testIndirectInlineUsedAsNonInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("indirectInlineUsedAsNonInline.kt") + public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + public void testInlineFunInGenericClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineFunInGenericClass.kt") + public void testInlineFunInGenericClass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + public void testInlineGenericFunCalledFromSubclass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineGenericFunCalledFromSubclass.kt") + public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendFunction.kt") + public void testInlineSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + public void testInlinedTryCatchFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlinedTryCatchFinally.kt") + public void testInlinedTryCatchFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + public void testInnerSuspensionCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerSuspensionCalls.kt") + public void testInnerSuspensionCalls_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + public void testInstanceOfContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("instanceOfContinuation.kt") + public void testInstanceOfContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + public void testIterateOverArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("iterateOverArray.kt") + public void testIterateOverArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt12958.kt") - public void testKt12958() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); + public void testKt12958_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt12958.kt") + public void testKt12958_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15016.kt") - public void testKt15016() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); + public void testKt15016_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15016.kt") + public void testKt15016_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15017.kt") - public void testKt15017() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); + public void testKt15017_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15017.kt") + public void testKt15017_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15930.kt") - public void testKt15930() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); + public void testKt15930_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15930.kt") + public void testKt15930_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt21605.kt") - public void testKt21605() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); + public void testKt21605_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt21605.kt") + public void testKt21605_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + public void testLastExpressionIsLoop_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastExpressionIsLoop.kt") + public void testLastExpressionIsLoop_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + public void testLastStatementInc_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastStatementInc.kt") + public void testLastStatementInc_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + public void testLastStementAssignment_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastStementAssignment.kt") + public void testLastStementAssignment_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + public void testLastUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastUnitExpression.kt") + public void testLastUnitExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localCallableRef.kt") - public void testLocalCallableRef() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + public void testLocalCallableRef_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localCallableRef.kt") + public void testLocalCallableRef_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localDelegate.kt") - public void testLocalDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + public void testLocalDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localDelegate.kt") + public void testLocalDelegate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + public void testLongRangeInSuspendCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("longRangeInSuspendCall.kt") + public void testLongRangeInSuspendCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + public void testLongRangeInSuspendFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("longRangeInSuspendFun.kt") + public void testLongRangeInSuspendFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + public void testMergeNullAndString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + @TestMetadata("mergeNullAndString.kt") + public void testMergeNullAndString_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + public void testMultipleInvokeCallsInsideInlineLambda1_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + public void testMultipleInvokeCallsInsideInlineLambda2_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + public void testMultipleInvokeCallsInsideInlineLambda3_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + public void testNestedTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nestedTryCatch.kt") + public void testNestedTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + public void testNoSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + @TestMetadata("noSuspensionPoints.kt") + public void testNoSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + public void testOverrideDefaultArgument_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("overrideDefaultArgument.kt") + public void testOverrideDefaultArgument_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + public void testRecursiveSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("recursiveSuspend.kt") + public void testRecursiveSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + public void testReturnByLabel_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simple.kt"); + @TestMetadata("returnByLabel.kt") + public void testReturnByLabel_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleException.kt") - public void testSimpleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); + public void testSimpleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleException.kt") + public void testSimpleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + public void testSimpleWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleWithHandleResult.kt") + public void testSimpleWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + public void testStatementLikeLastExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("statementLikeLastExpression.kt") + public void testStatementLikeLastExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + public void testSuspendCoroutineFromStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineFromStateMachine.kt") + public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + public void testSuspendDefaultImpl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendDefaultImpl.kt") + public void testSuspendDefaultImpl_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + public void testSuspendDelegation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendDelegation.kt") + public void testSuspendDelegation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + public void testSuspendFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFromInlineLambda.kt") + public void testSuspendFromInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + public void testSuspendFunImportedFromObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFunImportedFromObject.kt") + public void testSuspendFunImportedFromObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + @TestMetadata("suspendInCycle.kt") + public void testSuspendInCycle_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + public void testSuspensionInsideSafeCallWithElvis_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + public void testTryCatchFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchFinallyWithHandleResult.kt") + public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + public void testTryCatchWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchWithHandleResult.kt") + public void testTryCatchWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + public void testTryFinallyInsideInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryFinallyInsideInlineLambda.kt") + public void testTryFinallyInsideInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + public void testTryFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + @TestMetadata("tryFinallyWithHandleResult.kt") + public void testTryFinallyWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/box/coroutines/controlFlow") @@ -5469,68 +6029,159 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("breakFinally.kt") - public void testBreakFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + public void testBreakFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakFinally.kt") + public void testBreakFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + public void testBreakStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakStatement.kt") + public void testBreakStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + public void testDoWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("doWhileStatement.kt") + public void testDoWhileStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forContinue.kt") - public void testForContinue() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + public void testForContinue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forContinue.kt") + public void testForContinue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forStatement.kt") - public void testForStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + public void testForStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forStatement.kt") + public void testForStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forWithStep.kt") - public void testForWithStep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + public void testForWithStep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forWithStep.kt") + public void testForWithStep_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("ifStatement.kt") - public void testIfStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + public void testIfStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("ifStatement.kt") + public void testIfStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + public void testLabeledWhile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("labeledWhile.kt") + public void testLabeledWhile_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + public void testReturnFromFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnFromFinally.kt") + public void testReturnFromFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + public void testSwitchLikeWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("switchLikeWhen.kt") + public void testSwitchLikeWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + public void testThrowFromCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("throwFromCatch.kt") + public void testThrowFromCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + public void testThrowInTryWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("throwInTryWithHandleResult.kt") + public void testThrowInTryWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + public void testWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whileStatement.kt") + public void testWhileStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5547,48 +6198,111 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + public void testBreakWithNonEmptyStack_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakWithNonEmptyStack.kt") + public void testBreakWithNonEmptyStack_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("delegate.kt") - public void testDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + public void testDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("delegate.kt") + public void testDelegate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + public void testDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + @TestMetadata("destructuringInLambdas.kt") + public void testDestructuringInLambdas_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + public void testSafeCallOnTwoReceiversLong_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + public void testSuspendDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + @TestMetadata("suspendDestructuringInLambdas.kt") + public void testSuspendDestructuringInLambdas_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + public void testSuspendOperatorPlusAssign_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + public void testSuspendOperatorPlusCallFromLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec") @@ -5604,68 +6318,159 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + public void testControlFlowIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controlFlowIf.kt") + public void testControlFlowIf_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + public void testControlFlowWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controlFlowWhen.kt") + public void testControlFlowWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extention.kt") - public void testExtention() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + public void testExtention_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extention.kt") + public void testExtention_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + public void testInfixCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infixCall.kt") + public void testInfixCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + public void testInfixRecursiveCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infixRecursiveCall.kt") + public void testInfixRecursiveCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + public void testRealIteratorFoldl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realIteratorFoldl.kt") + public void testRealIteratorFoldl_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + public void testRealStringEscape_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realStringEscape.kt") + public void testRealStringEscape_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + public void testRealStringRepeat_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realStringRepeat.kt") + public void testRealStringRepeat_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + public void testReturnInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnInParentheses.kt") + public void testReturnInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sum.kt") - public void testSum() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + public void testSum_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sum.kt") + public void testSum_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + public void testTailCallInBlockInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallInBlockInParentheses.kt") + public void testTailCallInBlockInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + public void testTailCallInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallInParentheses.kt") + public void testTailCallInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + public void testWhenWithIs_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whenWithIs.kt") + public void testWhenWithIs_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } @@ -5683,53 +6488,123 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + public void testComplicatedMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("complicatedMerge.kt") + public void testComplicatedMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("i2bResult.kt") - public void testI2bResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + public void testI2bResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("i2bResult.kt") + public void testI2bResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + public void testLoadFromBooleanArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromBooleanArray.kt") + public void testLoadFromBooleanArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + public void testLoadFromByteArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromByteArray.kt") + public void testLoadFromByteArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + public void testNoVariableInTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noVariableInTable.kt") + public void testNoVariableInTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + public void testSameIconst1ManyVars_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sameIconst1ManyVars.kt") + public void testSameIconst1ManyVars_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + public void testUsedInArrayStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInArrayStore.kt") + public void testUsedInArrayStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + public void testUsedInMethodCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInMethodCall.kt") + public void testUsedInMethodCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + public void testUsedInPutfield_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInPutfield.kt") + public void testUsedInPutfield_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + public void testUsedInVarStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInVarStore.kt") + public void testUsedInVarStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5761,28 +6636,63 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("intercepted.kt") - public void testIntercepted() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + public void testIntercepted_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("startCoroutine.kt") - public void testStartCoroutine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + @TestMetadata("intercepted.kt") + public void testIntercepted_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + public void testStartCoroutineUninterceptedOrReturnInterception_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + public void testSuspendCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") + public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5829,53 +6739,123 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + public void testCapturedParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedParameters.kt") + public void testCapturedParameters_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extension.kt") - public void testExtension() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + public void testExtension_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extension.kt") + public void testExtension_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infix.kt") - public void testInfix() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + public void testInfix_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infix.kt") + public void testInfix_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + public void testInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("insideLambda.kt") + public void testInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + public void testNestedLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + @TestMetadata("nestedLocals.kt") + public void testNestedLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + public void testSimpleSuspensionPoint_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("stateMachine.kt") - public void testStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + public void testStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("stateMachine.kt") + public void testStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("withArguments.kt") - public void testWithArguments() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + public void testWithArguments_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withArguments.kt") + public void testWithArguments_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } @@ -5893,38 +6873,99 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + public void testInlineFunctionWithOptionalParam_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + @TestMetadata("inlineFunctionWithOptionalParam.kt") + public void testInlineFunctionWithOptionalParam_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + public void testInlineMultiModuleOverride_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + public void testInlineMultiModuleWithController_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + public void testInlineMultiModuleWithInnerInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + public void testInlineTailCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineTailCall.kt") + public void testInlineTailCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5941,8 +6982,15 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + public void testKtor_receivedMessage_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("ktor_receivedMessage.kt") + public void testKtor_receivedMessage_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5959,23 +7007,51 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("exception.kt") - public void testException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + public void testException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("exception.kt") + public void testException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendFunction.kt") + public void testInlineSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInCycle.kt") + public void testSuspendInCycle_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5992,83 +7068,195 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("dispatchResume.kt") + public void testDispatchResume_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("inline.kt") - public void testInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + @TestMetadata("handleException.kt") + public void testHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + public void testInlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("inline.kt") + public void testInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inline.kt") + public void testInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("member.kt") - public void testMember() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + public void testMember_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("member.kt") + public void testMember_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + public void testNoinlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noinlineTwoReceivers.kt") + public void testNoinlineTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("openFunWithJava.kt") - public void testOpenFunWithJava() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + public void testOpenFunWithJava_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("openFunWithJava.kt") + public void testOpenFunWithJava_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("operators.kt") - public void testOperators() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + public void testOperators_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("operators.kt") + public void testOperators_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + public void testPrivateFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("privateFunctions.kt") + public void testPrivateFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + public void testPrivateInFile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("privateInFile.kt") + public void testPrivateInFile_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + public void testReturnNoSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnNoSuspend.kt") + public void testReturnNoSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + public void testSuperCallAbstractClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + public void testSuperCallInterface_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("withVariables.kt") - public void testWithVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + public void testWithVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withVariables.kt") + public void testWithVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6085,18 +7273,39 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("localVal.kt") - public void testLocalVal() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + public void testLocalVal_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localVal.kt") + public void testLocalVal_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("manyParameters.kt") - public void testManyParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + public void testManyParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("manyParameters.kt") + public void testManyParameters_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendModifier.kt") @@ -6118,38 +7327,87 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("crossinline.kt") - public void testCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + public void testCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinline.kt") + public void testCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineWithStateMachine.kt") - public void testInlineWithStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + public void testInlineWithStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineWithStateMachine.kt") + public void testInlineWithStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + public void testInlineWithoutStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineWithoutStateMachine.kt") + public void testInlineWithoutStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + public void testTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatch.kt") + public void testTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unreachable.kt") - public void testUnreachable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + public void testUnreachable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unreachable.kt") + public void testUnreachable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenUnit.kt") - public void testWhenUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + public void testWhenUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whenUnit.kt") + public void testWhenUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6166,23 +7424,51 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + public void testSuspendWithIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithIf.kt") + public void testSuspendWithIf_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + public void testSuspendWithTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithTryCatch.kt") + public void testSuspendWithTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + public void testSuspendWithWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithWhen.kt") + public void testSuspendWithWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailInlining.kt") - public void testTailInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + public void testTailInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailInlining.kt") + public void testTailInlining_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6199,28 +7485,63 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + public void testCoroutineNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineNonLocalReturn.kt") + public void testCoroutineNonLocalReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + public void testCoroutineReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineReturn.kt") + public void testCoroutineReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + public void testSuspendNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendNonLocalReturn.kt") + public void testSuspendNonLocalReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + public void testSuspendReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendReturn.kt") + public void testSuspendReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + public void testUnitSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unitSafeCall.kt") + public void testUnitSafeCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6237,13 +7558,27 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("kt19475.kt") - public void testKt19475() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + public void testKt19475_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt19475.kt") + public void testKt19475_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + public void testNullSpilling_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nullSpilling.kt") + public void testNullSpilling_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java index 6e114922259..5e0e62508f5 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java @@ -3155,78 +3155,183 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + public void testInlineSuspendContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendContinuation.kt") + public void testInlineSuspendContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + public void testMultipleLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleLocals.kt") + public void testMultipleLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + public void testMultipleSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleSuspensionPoints.kt") + public void testMultipleSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnValue.kt") - public void testReturnValue() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + public void testReturnValue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnValue.kt") + public void testReturnValue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + public void testTryCatchStackTransform_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchStackTransform.kt") + public void testTryCatchStackTransform_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter") @@ -3242,13 +3347,27 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + public void testDefaultValueCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueCrossinline.kt") + public void testDefaultValueCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + public void testDefaultValueInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3265,43 +3384,99 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3317,59 +3492,136 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("innerLambda.kt") - public void testInnerLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + public void testInnerLambdaInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + public void testInnerLambdaWithoutCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerMadness.kt") - public void testInnerMadness() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + public void testInnerMadnessCallSite_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerObject.kt") - public void testInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + public void testInnerObjectInsideInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + public void testInnerObjectSeveralFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + public void testInnerObjectWithoutCapturingCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("normalInline.kt") - public void testNormalInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + public void testNormalInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("normalInline.kt") + public void testNormalInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + public void testNumberOfSuspentions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("numberOfSuspentions.kt") + public void testNumberOfSuspentions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java index bc06cac2c87..20fa0d15edb 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3155,78 +3155,183 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + public void testInlineSuspendContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendContinuation.kt") + public void testInlineSuspendContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + public void testMultipleLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleLocals.kt") + public void testMultipleLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + public void testMultipleSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleSuspensionPoints.kt") + public void testMultipleSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnValue.kt") - public void testReturnValue() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + public void testReturnValue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnValue.kt") + public void testReturnValue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + public void testTryCatchStackTransform_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchStackTransform.kt") + public void testTryCatchStackTransform_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter") @@ -3242,13 +3347,27 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + public void testDefaultValueCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueCrossinline.kt") + public void testDefaultValueCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + public void testDefaultValueInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3265,43 +3384,99 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3317,59 +3492,136 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("innerLambda.kt") - public void testInnerLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + public void testInnerLambdaInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + public void testInnerLambdaWithoutCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerMadness.kt") - public void testInnerMadness() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + public void testInnerMadnessCallSite_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerObject.kt") - public void testInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + public void testInnerObjectInsideInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + public void testInnerObjectSeveralFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + public void testInnerObjectWithoutCapturingCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("normalInline.kt") - public void testNormalInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + public void testNormalInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("normalInline.kt") + public void testNormalInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + public void testNumberOfSuspentions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("numberOfSuspentions.kt") + public void testNumberOfSuspentions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java index 6b1aeb59f29..b53066c4283 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java @@ -29,14 +29,28 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/box"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("async.kt") - public void testAsync() throws Exception { - runTest("compiler/testData/codegen/java8/box/async.kt"); + @TestMetadata("asyncException.kt") + public void testAsyncException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/asyncException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("asyncException.kt") - public void testAsyncException() throws Exception { - runTest("compiler/testData/codegen/java8/box/asyncException.kt"); + public void testAsyncException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/asyncException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("async.kt") + public void testAsync_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/async.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("async.kt") + public void testAsync_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/box/async.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("capturedSuperCall.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index 6465e3c8e8a..602963daf87 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -1367,8 +1367,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("kt18292.kt") - public void testKt18292() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt"); + public void testKt18292_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt18292.kt") + public void testKt18292_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lambdaExpectedType.kt") @@ -1392,8 +1399,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + public void testNoDefaultCoroutineImports_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noDefaultCoroutineImports.kt") + public void testNoDefaultCoroutineImports_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nonLocalSuspension.kt") @@ -1422,8 +1436,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + public void testSuspendApplicability_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendApplicability.kt") + public void testSuspendApplicability_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendConflictsWithNoSuspend.kt") @@ -1432,8 +1453,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("suspendCoroutineOrReturn.kt") - public void testSuspendCoroutineOrReturn() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + public void testSuspendCoroutineOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineOrReturn.kt") + public void testSuspendCoroutineOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineUnavailableWithNewAPI.kt") @@ -1457,8 +1485,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + public void testSuspendFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFunctions.kt") + public void testSuspendFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendLambda.kt") @@ -1577,63 +1612,147 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); + public void testInlineOrdinaryOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") + public void testInlineOrdinaryOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); + public void testInlineOrdinaryOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") + public void testInlineOrdinaryOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); + public void testInlineOrdinaryOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfOrdinary.kt") + public void testInlineOrdinaryOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); + public void testInlineOrdinaryOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfSuspend.kt") + public void testInlineOrdinaryOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -1650,28 +1769,63 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + public void testAllMembersAllowed_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("allMembersAllowed.kt") + public void testAllMembersAllowed_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extensions.kt") - public void testExtensions() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + public void testExtensions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extensions.kt") + public void testExtensions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + public void testNotRelatedFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("notRelatedFun.kt") + public void testNotRelatedFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sameInstance.kt") - public void testSameInstance() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + public void testSameInstance_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sameInstance.kt") + public void testSameInstance_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + public void testSimpleForbidden_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleForbidden.kt") + public void testSimpleForbidden_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -1771,8 +1925,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("forbidden.kt") - public void testForbidden() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + public void testForbidden_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forbidden.kt") + public void testForbidden_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localFunctions.kt") @@ -1781,8 +1942,15 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("nothingTypedSuspendFunction.kt") - public void testNothingTypedSuspendFunction() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + public void testNothingTypedSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nothingTypedSuspendFunction.kt") + public void testNothingTypedSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("recursive.kt") @@ -1791,13 +1959,27 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + public void testTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatch.kt") + public void testTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("valid.kt") - public void testValid() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + public void testValid_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("valid.kt") + public void testValid_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java index 3aa1be39eeb..66d663b2712 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java @@ -1367,8 +1367,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("kt18292.kt") - public void testKt18292() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt"); + public void testKt18292_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt18292.kt") + public void testKt18292_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lambdaExpectedType.kt") @@ -1392,8 +1399,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + public void testNoDefaultCoroutineImports_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noDefaultCoroutineImports.kt") + public void testNoDefaultCoroutineImports_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nonLocalSuspension.kt") @@ -1422,8 +1436,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + public void testSuspendApplicability_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendApplicability.kt") + public void testSuspendApplicability_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendConflictsWithNoSuspend.kt") @@ -1432,8 +1453,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("suspendCoroutineOrReturn.kt") - public void testSuspendCoroutineOrReturn() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + public void testSuspendCoroutineOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineOrReturn.kt") + public void testSuspendCoroutineOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineUnavailableWithNewAPI.kt") @@ -1457,8 +1485,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + public void testSuspendFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFunctions.kt") + public void testSuspendFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendLambda.kt") @@ -1577,63 +1612,147 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); + public void testInlineOrdinaryOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") + public void testInlineOrdinaryOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); + public void testInlineOrdinaryOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") + public void testInlineOrdinaryOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); + public void testInlineOrdinaryOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfOrdinary.kt") + public void testInlineOrdinaryOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); + public void testInlineOrdinaryOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfSuspend.kt") + public void testInlineOrdinaryOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -1650,28 +1769,63 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + public void testAllMembersAllowed_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("allMembersAllowed.kt") + public void testAllMembersAllowed_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extensions.kt") - public void testExtensions() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + public void testExtensions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extensions.kt") + public void testExtensions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + public void testNotRelatedFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("notRelatedFun.kt") + public void testNotRelatedFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sameInstance.kt") - public void testSameInstance() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + public void testSameInstance_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sameInstance.kt") + public void testSameInstance_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + public void testSimpleForbidden_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleForbidden.kt") + public void testSimpleForbidden_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -1771,8 +1925,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("forbidden.kt") - public void testForbidden() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + public void testForbidden_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forbidden.kt") + public void testForbidden_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localFunctions.kt") @@ -1781,8 +1942,15 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("nothingTypedSuspendFunction.kt") - public void testNothingTypedSuspendFunction() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + public void testNothingTypedSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nothingTypedSuspendFunction.kt") + public void testNothingTypedSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/nothingTypedSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("recursive.kt") @@ -1791,13 +1959,27 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + public void testTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatch.kt") + public void testTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("valid.kt") - public void testValid() throws Exception { - runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + public void testValid_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("valid.kt") + public void testValid_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 75a8e7b8dca..6826437f7d7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -3743,8 +3743,15 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("withCoroutines.kt") - public void testWithCoroutines() throws Exception { - runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + public void testWithCoroutines_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5058,402 +5065,955 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + public void test32defaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("32defaultParametersInSuspend.kt") + public void test32defaultParametersInSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + public void testAccessorForSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("accessorForSuspend.kt") + public void testAccessorForSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); } - @TestMetadata("asyncIterator.kt") - public void testAsyncIterator() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + @TestMetadata("asyncIteratorNullMerge.kt") + public void testAsyncIteratorNullMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("asyncIteratorNullMerge.kt") - public void testAsyncIteratorNullMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + public void testAsyncIteratorNullMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("asyncIteratorToList.kt") - public void testAsyncIteratorToList() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + public void testAsyncIteratorToList_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIteratorToList.kt") + public void testAsyncIteratorToList_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("await.kt") - public void testAwait() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/await.kt"); + public void testAwait_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("beginWithException.kt") - public void testBeginWithException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + @TestMetadata("await.kt") + public void testAwait_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + public void testBeginWithExceptionNoHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + public void testCoercionToUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coercionToUnit.kt") + public void testCoercionToUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + public void testControllerAccessFromInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controllerAccessFromInnerLambda.kt") + public void testControllerAccessFromInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + public void testCoroutineContextInInlinedLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineContextInInlinedLambda.kt") + public void testCoroutineContextInInlinedLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineToString.kt") - public void testCoroutineToString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + public void testCoroutineToString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineToString.kt") + public void testCoroutineToString_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + public void testCreateCoroutineSafe_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("createCoroutineSafe.kt") + public void testCreateCoroutineSafe_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + public void testCreateCoroutinesOnManualInstances_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("createCoroutinesOnManualInstances.kt") + public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + public void testCrossInlineWithCapturedOuterReceiver_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") + public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + public void testDefaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("dispatchResume.kt") + public void testDispatchResume_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + public void testEmptyClosure_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("emptyClosure.kt") + public void testEmptyClosure_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + public void testFalseUnitCoercion_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("falseUnitCoercion.kt") + public void testFalseUnitCoercion_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("generate.kt") - public void testGenerate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/generate.kt"); + public void testGenerate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("generate.kt") + public void testGenerate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleException.kt") + public void testHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + public void testHandleResultCallEmptyBody_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultCallEmptyBody.kt") + public void testHandleResultCallEmptyBody_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + public void testHandleResultNonUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultNonUnitExpression.kt") + public void testHandleResultNonUnitExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + public void testHandleResultSuspended_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultSuspended.kt") + public void testHandleResultSuspended_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("illegalState.kt") - public void testIllegalState() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/illegalState.kt"); + public void testIllegalState_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/illegalState.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("illegalState.kt") + public void testIllegalState_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/illegalState.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + public void testIndirectInlineUsedAsNonInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("indirectInlineUsedAsNonInline.kt") + public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + public void testInlineFunInGenericClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineFunInGenericClass.kt") + public void testInlineFunInGenericClass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + public void testInlineGenericFunCalledFromSubclass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineGenericFunCalledFromSubclass.kt") + public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendFunction.kt") + public void testInlineSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + public void testInlinedTryCatchFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlinedTryCatchFinally.kt") + public void testInlinedTryCatchFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + public void testInnerSuspensionCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerSuspensionCalls.kt") + public void testInnerSuspensionCalls_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + public void testInstanceOfContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("instanceOfContinuation.kt") + public void testInstanceOfContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + public void testIterateOverArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("iterateOverArray.kt") + public void testIterateOverArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt12958.kt") - public void testKt12958() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); + public void testKt12958_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt12958.kt") + public void testKt12958_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15016.kt") - public void testKt15016() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); + public void testKt15016_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15016.kt") + public void testKt15016_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15017.kt") - public void testKt15017() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); + public void testKt15017_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15017.kt") + public void testKt15017_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15930.kt") - public void testKt15930() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); + public void testKt15930_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15930.kt") + public void testKt15930_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt21605.kt") - public void testKt21605() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); + public void testKt21605_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt21605.kt") + public void testKt21605_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + public void testLastExpressionIsLoop_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastExpressionIsLoop.kt") + public void testLastExpressionIsLoop_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + public void testLastStatementInc_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastStatementInc.kt") + public void testLastStatementInc_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + public void testLastStementAssignment_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastStementAssignment.kt") + public void testLastStementAssignment_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + public void testLastUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastUnitExpression.kt") + public void testLastUnitExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localCallableRef.kt") - public void testLocalCallableRef() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + public void testLocalCallableRef_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localCallableRef.kt") + public void testLocalCallableRef_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localDelegate.kt") - public void testLocalDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + public void testLocalDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localDelegate.kt") + public void testLocalDelegate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + public void testLongRangeInSuspendCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("longRangeInSuspendCall.kt") + public void testLongRangeInSuspendCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + public void testLongRangeInSuspendFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("longRangeInSuspendFun.kt") + public void testLongRangeInSuspendFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + public void testMergeNullAndString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + @TestMetadata("mergeNullAndString.kt") + public void testMergeNullAndString_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + public void testMultipleInvokeCallsInsideInlineLambda1_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + public void testMultipleInvokeCallsInsideInlineLambda2_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + public void testMultipleInvokeCallsInsideInlineLambda3_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + public void testNestedTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nestedTryCatch.kt") + public void testNestedTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + public void testNoSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + @TestMetadata("noSuspensionPoints.kt") + public void testNoSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + public void testOverrideDefaultArgument_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("overrideDefaultArgument.kt") + public void testOverrideDefaultArgument_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + public void testRecursiveSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("recursiveSuspend.kt") + public void testRecursiveSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + public void testReturnByLabel_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simple.kt"); + @TestMetadata("returnByLabel.kt") + public void testReturnByLabel_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleException.kt") - public void testSimpleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); + public void testSimpleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleException.kt") + public void testSimpleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + public void testSimpleWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleWithHandleResult.kt") + public void testSimpleWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + public void testStatementLikeLastExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("statementLikeLastExpression.kt") + public void testStatementLikeLastExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + public void testSuspendCoroutineFromStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineFromStateMachine.kt") + public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + public void testSuspendDefaultImpl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendDefaultImpl.kt") + public void testSuspendDefaultImpl_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + public void testSuspendDelegation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendDelegation.kt") + public void testSuspendDelegation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + public void testSuspendFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFromInlineLambda.kt") + public void testSuspendFromInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + public void testSuspendFunImportedFromObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFunImportedFromObject.kt") + public void testSuspendFunImportedFromObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + @TestMetadata("suspendInCycle.kt") + public void testSuspendInCycle_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + public void testSuspensionInsideSafeCallWithElvis_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + public void testTryCatchFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchFinallyWithHandleResult.kt") + public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + public void testTryCatchWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchWithHandleResult.kt") + public void testTryCatchWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + public void testTryFinallyInsideInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryFinallyInsideInlineLambda.kt") + public void testTryFinallyInsideInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + public void testTryFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + @TestMetadata("tryFinallyWithHandleResult.kt") + public void testTryFinallyWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/box/coroutines/controlFlow") @@ -5469,68 +6029,159 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("breakFinally.kt") - public void testBreakFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + public void testBreakFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakFinally.kt") + public void testBreakFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + public void testBreakStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakStatement.kt") + public void testBreakStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + public void testDoWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("doWhileStatement.kt") + public void testDoWhileStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forContinue.kt") - public void testForContinue() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + public void testForContinue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forContinue.kt") + public void testForContinue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forStatement.kt") - public void testForStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + public void testForStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forStatement.kt") + public void testForStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forWithStep.kt") - public void testForWithStep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + public void testForWithStep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forWithStep.kt") + public void testForWithStep_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("ifStatement.kt") - public void testIfStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + public void testIfStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("ifStatement.kt") + public void testIfStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + public void testLabeledWhile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("labeledWhile.kt") + public void testLabeledWhile_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + public void testReturnFromFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnFromFinally.kt") + public void testReturnFromFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + public void testSwitchLikeWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("switchLikeWhen.kt") + public void testSwitchLikeWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + public void testThrowFromCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("throwFromCatch.kt") + public void testThrowFromCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + public void testThrowInTryWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("throwInTryWithHandleResult.kt") + public void testThrowInTryWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + public void testWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whileStatement.kt") + public void testWhileStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5547,48 +6198,111 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + public void testBreakWithNonEmptyStack_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakWithNonEmptyStack.kt") + public void testBreakWithNonEmptyStack_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("delegate.kt") - public void testDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + public void testDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("delegate.kt") + public void testDelegate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + public void testDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + @TestMetadata("destructuringInLambdas.kt") + public void testDestructuringInLambdas_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + public void testSafeCallOnTwoReceiversLong_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + public void testSuspendDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + @TestMetadata("suspendDestructuringInLambdas.kt") + public void testSuspendDestructuringInLambdas_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + public void testSuspendOperatorPlusAssign_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + public void testSuspendOperatorPlusCallFromLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec") @@ -5604,68 +6318,159 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + public void testControlFlowIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controlFlowIf.kt") + public void testControlFlowIf_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + public void testControlFlowWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controlFlowWhen.kt") + public void testControlFlowWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extention.kt") - public void testExtention() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + public void testExtention_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extention.kt") + public void testExtention_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + public void testInfixCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infixCall.kt") + public void testInfixCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + public void testInfixRecursiveCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infixRecursiveCall.kt") + public void testInfixRecursiveCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + public void testRealIteratorFoldl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realIteratorFoldl.kt") + public void testRealIteratorFoldl_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + public void testRealStringEscape_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realStringEscape.kt") + public void testRealStringEscape_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + public void testRealStringRepeat_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realStringRepeat.kt") + public void testRealStringRepeat_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + public void testReturnInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnInParentheses.kt") + public void testReturnInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sum.kt") - public void testSum() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + public void testSum_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sum.kt") + public void testSum_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + public void testTailCallInBlockInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallInBlockInParentheses.kt") + public void testTailCallInBlockInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + public void testTailCallInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallInParentheses.kt") + public void testTailCallInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + public void testWhenWithIs_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whenWithIs.kt") + public void testWhenWithIs_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } @@ -5683,53 +6488,123 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + public void testComplicatedMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("complicatedMerge.kt") + public void testComplicatedMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("i2bResult.kt") - public void testI2bResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + public void testI2bResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("i2bResult.kt") + public void testI2bResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + public void testLoadFromBooleanArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromBooleanArray.kt") + public void testLoadFromBooleanArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + public void testLoadFromByteArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromByteArray.kt") + public void testLoadFromByteArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + public void testNoVariableInTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noVariableInTable.kt") + public void testNoVariableInTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + public void testSameIconst1ManyVars_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sameIconst1ManyVars.kt") + public void testSameIconst1ManyVars_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + public void testUsedInArrayStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInArrayStore.kt") + public void testUsedInArrayStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + public void testUsedInMethodCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInMethodCall.kt") + public void testUsedInMethodCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + public void testUsedInPutfield_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInPutfield.kt") + public void testUsedInPutfield_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + public void testUsedInVarStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInVarStore.kt") + public void testUsedInVarStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5761,28 +6636,63 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("intercepted.kt") - public void testIntercepted() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + public void testIntercepted_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("startCoroutine.kt") - public void testStartCoroutine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + @TestMetadata("intercepted.kt") + public void testIntercepted_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + public void testStartCoroutineUninterceptedOrReturnInterception_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + public void testSuspendCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") + public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5829,53 +6739,123 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + public void testCapturedParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedParameters.kt") + public void testCapturedParameters_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extension.kt") - public void testExtension() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + public void testExtension_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extension.kt") + public void testExtension_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infix.kt") - public void testInfix() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + public void testInfix_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infix.kt") + public void testInfix_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + public void testInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("insideLambda.kt") + public void testInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + public void testNestedLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + @TestMetadata("nestedLocals.kt") + public void testNestedLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + public void testSimpleSuspensionPoint_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("stateMachine.kt") - public void testStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + public void testStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("stateMachine.kt") + public void testStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("withArguments.kt") - public void testWithArguments() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + public void testWithArguments_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withArguments.kt") + public void testWithArguments_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } @@ -5893,38 +6873,99 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + public void testInlineFunctionWithOptionalParam_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + @TestMetadata("inlineFunctionWithOptionalParam.kt") + public void testInlineFunctionWithOptionalParam_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + public void testInlineMultiModuleOverride_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + public void testInlineMultiModuleWithController_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + public void testInlineMultiModuleWithInnerInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + public void testInlineTailCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineTailCall.kt") + public void testInlineTailCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5941,8 +6982,15 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + public void testKtor_receivedMessage_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("ktor_receivedMessage.kt") + public void testKtor_receivedMessage_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5959,23 +7007,51 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("exception.kt") - public void testException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + public void testException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("exception.kt") + public void testException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendFunction.kt") + public void testInlineSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInCycle.kt") + public void testSuspendInCycle_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5992,83 +7068,195 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("dispatchResume.kt") + public void testDispatchResume_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("inline.kt") - public void testInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + @TestMetadata("handleException.kt") + public void testHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + public void testInlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("inline.kt") + public void testInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inline.kt") + public void testInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("member.kt") - public void testMember() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + public void testMember_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("member.kt") + public void testMember_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + public void testNoinlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noinlineTwoReceivers.kt") + public void testNoinlineTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("openFunWithJava.kt") - public void testOpenFunWithJava() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + public void testOpenFunWithJava_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("openFunWithJava.kt") + public void testOpenFunWithJava_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("operators.kt") - public void testOperators() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + public void testOperators_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("operators.kt") + public void testOperators_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + public void testPrivateFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("privateFunctions.kt") + public void testPrivateFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + public void testPrivateInFile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("privateInFile.kt") + public void testPrivateInFile_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + public void testReturnNoSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnNoSuspend.kt") + public void testReturnNoSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + public void testSuperCallAbstractClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + public void testSuperCallInterface_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("withVariables.kt") - public void testWithVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + public void testWithVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withVariables.kt") + public void testWithVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6085,18 +7273,39 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("localVal.kt") - public void testLocalVal() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + public void testLocalVal_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localVal.kt") + public void testLocalVal_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("manyParameters.kt") - public void testManyParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + public void testManyParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("manyParameters.kt") + public void testManyParameters_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendModifier.kt") @@ -6118,38 +7327,87 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("crossinline.kt") - public void testCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + public void testCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinline.kt") + public void testCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineWithStateMachine.kt") - public void testInlineWithStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + public void testInlineWithStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineWithStateMachine.kt") + public void testInlineWithStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + public void testInlineWithoutStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineWithoutStateMachine.kt") + public void testInlineWithoutStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + public void testTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatch.kt") + public void testTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unreachable.kt") - public void testUnreachable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + public void testUnreachable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unreachable.kt") + public void testUnreachable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenUnit.kt") - public void testWhenUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + public void testWhenUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whenUnit.kt") + public void testWhenUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6166,23 +7424,51 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + public void testSuspendWithIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithIf.kt") + public void testSuspendWithIf_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + public void testSuspendWithTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithTryCatch.kt") + public void testSuspendWithTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + public void testSuspendWithWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithWhen.kt") + public void testSuspendWithWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailInlining.kt") - public void testTailInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + public void testTailInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailInlining.kt") + public void testTailInlining_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6199,28 +7485,63 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + public void testCoroutineNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineNonLocalReturn.kt") + public void testCoroutineNonLocalReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + public void testCoroutineReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineReturn.kt") + public void testCoroutineReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + public void testSuspendNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendNonLocalReturn.kt") + public void testSuspendNonLocalReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + public void testSuspendReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendReturn.kt") + public void testSuspendReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + public void testUnitSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unitSafeCall.kt") + public void testUnitSafeCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6237,13 +7558,27 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("kt19475.kt") - public void testKt19475() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + public void testKt19475_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt19475.kt") + public void testKt19475_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + public void testNullSpilling_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nullSpilling.kt") + public void testNullSpilling_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java index 7c9396b5833..1e12127e2a4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java @@ -3155,78 +3155,183 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + public void testInlineSuspendContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendContinuation.kt") + public void testInlineSuspendContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + public void testMultipleLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleLocals.kt") + public void testMultipleLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + public void testMultipleSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleSuspensionPoints.kt") + public void testMultipleSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnValue.kt") - public void testReturnValue() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + public void testReturnValue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnValue.kt") + public void testReturnValue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + public void testTryCatchStackTransform_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchStackTransform.kt") + public void testTryCatchStackTransform_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter") @@ -3242,13 +3347,27 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + public void testDefaultValueCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueCrossinline.kt") + public void testDefaultValueCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + public void testDefaultValueInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3265,43 +3384,99 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3317,59 +3492,136 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("innerLambda.kt") - public void testInnerLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + public void testInnerLambdaInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + public void testInnerLambdaWithoutCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerMadness.kt") - public void testInnerMadness() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + public void testInnerMadnessCallSite_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerObject.kt") - public void testInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + public void testInnerObjectInsideInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + public void testInnerObjectSeveralFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + public void testInnerObjectWithoutCapturingCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("normalInline.kt") - public void testNormalInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + public void testNormalInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("normalInline.kt") + public void testNormalInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + public void testNumberOfSuspentions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("numberOfSuspentions.kt") + public void testNumberOfSuspentions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java index 81f8f970a50..3188334249b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java @@ -40,8 +40,15 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { } @TestMetadata("coroutineFields.kt") - public void testCoroutineFields() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/coroutineFields.kt"); + public void testCoroutineFields_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/coroutineFields.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineFields.kt") + public void testCoroutineFields_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/coroutineFields.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultImpls.kt") @@ -125,8 +132,15 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { } @TestMetadata("oomInReturnUnit.kt") - public void testOomInReturnUnit() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt"); + public void testOomInReturnUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("oomInReturnUnit.kt") + public void testOomInReturnUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/oomInReturnUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateSuspendFun.kt") @@ -145,8 +159,15 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { } @TestMetadata("suspendReifiedFun.kt") - public void testSuspendReifiedFun() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt"); + public void testSuspendReifiedFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendReifiedFun.kt") + public void testSuspendReifiedFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/suspendReifiedFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/bytecodeListing/annotations") @@ -337,23 +358,51 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { } @TestMetadata("tailCallIntrinsics.kt") - public void testTailCallIntrinsics() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt"); + public void testTailCallIntrinsics_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallIntrinsics.kt") + public void testTailCallIntrinsics_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/tailCallIntrinsics.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailSuspendUnitFun.kt") - public void testTailSuspendUnitFun() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt"); + public void testTailSuspendUnitFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailSuspendUnitFun.kt") + public void testTailSuspendUnitFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/tailSuspendUnitFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchTailCall.kt") - public void testTryCatchTailCall() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt"); + public void testTryCatchTailCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchTailCall.kt") + public void testTryCatchTailCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/tryCatchTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unreachable.kt") - public void testUnreachable() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt"); + public void testUnreachable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unreachable.kt") + public void testUnreachable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/tailcall/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenUnit.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java index ef5ad635523..d58126457d2 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java @@ -1034,23 +1034,51 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { } @TestMetadata("doNotReassignContinuation.kt") - public void testDoNotReassignContinuation() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt"); + public void testDoNotReassignContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("doNotReassignContinuation.kt") + public void testDoNotReassignContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/doNotReassignContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnUnitInLambda.kt") - public void testReturnUnitInLambda() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt"); + public void testReturnUnitInLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt"); + @TestMetadata("returnUnitInLambda.kt") + public void testReturnUnitInLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt"); + public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling") @@ -1066,53 +1094,123 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + public void testComplicatedMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("complicatedMerge.kt") + public void testComplicatedMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("i2bResult.kt") - public void testI2bResult() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt"); + public void testI2bResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("i2bResult.kt") + public void testI2bResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + public void testLoadFromBooleanArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromBooleanArray.kt") + public void testLoadFromBooleanArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + public void testLoadFromByteArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromByteArray.kt") + public void testLoadFromByteArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + public void testNoVariableInTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noVariableInTable.kt") + public void testNoVariableInTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + public void testSameIconst1ManyVars_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sameIconst1ManyVars.kt") + public void testSameIconst1ManyVars_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + public void testUsedInArrayStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInArrayStore.kt") + public void testUsedInArrayStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + public void testUsedInMethodCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInMethodCall.kt") + public void testUsedInMethodCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + public void testUsedInPutfield_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInPutfield.kt") + public void testUsedInPutfield_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + public void testUsedInVarStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInVarStore.kt") + public void testUsedInVarStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java index c72bee3d5f4..5bcb31f8d6e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3155,78 +3155,183 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + public void testInlineSuspendContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendContinuation.kt") + public void testInlineSuspendContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + public void testMultipleLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleLocals.kt") + public void testMultipleLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + public void testMultipleSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleSuspensionPoints.kt") + public void testMultipleSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnValue.kt") - public void testReturnValue() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + public void testReturnValue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnValue.kt") + public void testReturnValue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + public void testTryCatchStackTransform_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchStackTransform.kt") + public void testTryCatchStackTransform_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter") @@ -3242,13 +3347,27 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + public void testDefaultValueCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueCrossinline.kt") + public void testDefaultValueCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + public void testDefaultValueInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3265,43 +3384,99 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") + public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") + public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") + public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") + public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") + public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") + public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + public void testInlineSuspendOfOrdinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfOrdinary.kt") + public void testInlineSuspendOfOrdinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + public void testInlineSuspendOfSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendOfSuspend.kt") + public void testInlineSuspendOfSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -3317,59 +3492,136 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - @TestMetadata("innerLambda.kt") - public void testInnerLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + public void testInnerLambdaInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + public void testInnerLambdaWithoutCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerMadness.kt") - public void testInnerMadness() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerLambda.kt") + public void testInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + public void testInnerMadnessCallSite_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("innerObject.kt") - public void testInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerMadness.kt") + public void testInnerMadness_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + public void testInnerObjectInsideInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + public void testInnerObjectSeveralFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + public void testInnerObjectWithoutCapturingCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerObject.kt") + public void testInnerObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("normalInline.kt") - public void testNormalInline() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + public void testNormalInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("normalInline.kt") + public void testNormalInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions() throws Exception { - runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + public void testNumberOfSuspentions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("numberOfSuspentions.kt") + public void testNumberOfSuspentions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java index f756caeb1fa..365b1675691 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java @@ -80,8 +80,15 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl } @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary() throws Exception { - runTest("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); + public void testCoroutinesBinary_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutinesBinary.kt") + public void testCoroutinesBinary_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultConstructor.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 8d8b9ac5589..56657a495f1 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -3743,8 +3743,15 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("withCoroutines.kt") - public void testWithCoroutines() throws Exception { - runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + public void testWithCoroutines_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5058,402 +5065,955 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + public void test32defaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("32defaultParametersInSuspend.kt") + public void test32defaultParametersInSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + public void testAccessorForSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("accessorForSuspend.kt") + public void testAccessorForSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); } - @TestMetadata("asyncIterator.kt") - public void testAsyncIterator() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + @TestMetadata("asyncIteratorNullMerge.kt") + public void testAsyncIteratorNullMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("asyncIteratorNullMerge.kt") - public void testAsyncIteratorNullMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + public void testAsyncIteratorNullMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("asyncIteratorToList.kt") - public void testAsyncIteratorToList() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + public void testAsyncIteratorToList_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIteratorToList.kt") + public void testAsyncIteratorToList_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("await.kt") - public void testAwait() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/await.kt"); + public void testAwait_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("beginWithException.kt") - public void testBeginWithException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + @TestMetadata("await.kt") + public void testAwait_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + public void testBeginWithExceptionNoHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + public void testCoercionToUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coercionToUnit.kt") + public void testCoercionToUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + public void testControllerAccessFromInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controllerAccessFromInnerLambda.kt") + public void testControllerAccessFromInnerLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + public void testCoroutineContextInInlinedLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineContextInInlinedLambda.kt") + public void testCoroutineContextInInlinedLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineToString.kt") - public void testCoroutineToString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + public void testCoroutineToString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineToString.kt") + public void testCoroutineToString_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineToString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + public void testCreateCoroutineSafe_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("createCoroutineSafe.kt") + public void testCreateCoroutineSafe_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + public void testCreateCoroutinesOnManualInstances_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("createCoroutinesOnManualInstances.kt") + public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + public void testCrossInlineWithCapturedOuterReceiver_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") + public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + public void testDefaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("dispatchResume.kt") + public void testDispatchResume_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + public void testEmptyClosure_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("emptyClosure.kt") + public void testEmptyClosure_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + public void testFalseUnitCoercion_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("falseUnitCoercion.kt") + public void testFalseUnitCoercion_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("generate.kt") - public void testGenerate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/generate.kt"); + public void testGenerate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("generate.kt") + public void testGenerate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleException.kt") + public void testHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + public void testHandleResultCallEmptyBody_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultCallEmptyBody.kt") + public void testHandleResultCallEmptyBody_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + public void testHandleResultNonUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultNonUnitExpression.kt") + public void testHandleResultNonUnitExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + public void testHandleResultSuspended_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("handleResultSuspended.kt") + public void testHandleResultSuspended_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("illegalState.kt") - public void testIllegalState() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/illegalState.kt"); + public void testIllegalState_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/illegalState.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("illegalState.kt") + public void testIllegalState_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/illegalState.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + public void testIndirectInlineUsedAsNonInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("indirectInlineUsedAsNonInline.kt") + public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + public void testInlineFunInGenericClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineFunInGenericClass.kt") + public void testInlineFunInGenericClass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + public void testInlineGenericFunCalledFromSubclass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineGenericFunCalledFromSubclass.kt") + public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendFunction.kt") + public void testInlineSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + public void testInlinedTryCatchFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlinedTryCatchFinally.kt") + public void testInlinedTryCatchFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + public void testInnerSuspensionCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("innerSuspensionCalls.kt") + public void testInnerSuspensionCalls_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + public void testInstanceOfContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("instanceOfContinuation.kt") + public void testInstanceOfContinuation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + public void testIterateOverArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("iterateOverArray.kt") + public void testIterateOverArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt12958.kt") - public void testKt12958() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); + public void testKt12958_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt12958.kt") + public void testKt12958_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15016.kt") - public void testKt15016() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); + public void testKt15016_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15016.kt") + public void testKt15016_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15017.kt") - public void testKt15017() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); + public void testKt15017_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15017.kt") + public void testKt15017_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt15930.kt") - public void testKt15930() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); + public void testKt15930_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt15930.kt") + public void testKt15930_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("kt21605.kt") - public void testKt21605() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); + public void testKt21605_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt21605.kt") + public void testKt21605_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + public void testLastExpressionIsLoop_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastExpressionIsLoop.kt") + public void testLastExpressionIsLoop_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + public void testLastStatementInc_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastStatementInc.kt") + public void testLastStatementInc_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + public void testLastStementAssignment_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastStementAssignment.kt") + public void testLastStementAssignment_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + public void testLastUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("lastUnitExpression.kt") + public void testLastUnitExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localCallableRef.kt") - public void testLocalCallableRef() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + public void testLocalCallableRef_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localCallableRef.kt") + public void testLocalCallableRef_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("localDelegate.kt") - public void testLocalDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + public void testLocalDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localDelegate.kt") + public void testLocalDelegate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + public void testLongRangeInSuspendCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("longRangeInSuspendCall.kt") + public void testLongRangeInSuspendCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + public void testLongRangeInSuspendFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("longRangeInSuspendFun.kt") + public void testLongRangeInSuspendFun_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + public void testMergeNullAndString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + @TestMetadata("mergeNullAndString.kt") + public void testMergeNullAndString_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + public void testMultipleInvokeCallsInsideInlineLambda1_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + public void testMultipleInvokeCallsInsideInlineLambda2_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + public void testMultipleInvokeCallsInsideInlineLambda3_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + public void testNestedTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nestedTryCatch.kt") + public void testNestedTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + public void testNoSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + @TestMetadata("noSuspensionPoints.kt") + public void testNoSuspensionPoints_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + public void testOverrideDefaultArgument_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("overrideDefaultArgument.kt") + public void testOverrideDefaultArgument_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + public void testRecursiveSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("recursiveSuspend.kt") + public void testRecursiveSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + public void testReturnByLabel_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simple.kt"); + @TestMetadata("returnByLabel.kt") + public void testReturnByLabel_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleException.kt") - public void testSimpleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); + public void testSimpleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleException.kt") + public void testSimpleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + public void testSimpleWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleWithHandleResult.kt") + public void testSimpleWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + public void testStatementLikeLastExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("statementLikeLastExpression.kt") + public void testStatementLikeLastExpression_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + public void testSuspendCoroutineFromStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineFromStateMachine.kt") + public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + public void testSuspendDefaultImpl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendDefaultImpl.kt") + public void testSuspendDefaultImpl_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + public void testSuspendDelegation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendDelegation.kt") + public void testSuspendDelegation_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + public void testSuspendFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFromInlineLambda.kt") + public void testSuspendFromInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + public void testSuspendFunImportedFromObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendFunImportedFromObject.kt") + public void testSuspendFunImportedFromObject_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + @TestMetadata("suspendInCycle.kt") + public void testSuspendInCycle_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + public void testSuspensionInsideSafeCallWithElvis_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + public void testTryCatchFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchFinallyWithHandleResult.kt") + public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + public void testTryCatchWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatchWithHandleResult.kt") + public void testTryCatchWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + public void testTryFinallyInsideInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryFinallyInsideInlineLambda.kt") + public void testTryFinallyInsideInlineLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + public void testTryFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + @TestMetadata("tryFinallyWithHandleResult.kt") + public void testTryFinallyWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/box/coroutines/controlFlow") @@ -5469,68 +6029,159 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("breakFinally.kt") - public void testBreakFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + public void testBreakFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakFinally.kt") + public void testBreakFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + public void testBreakStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakStatement.kt") + public void testBreakStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + public void testDoWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("doWhileStatement.kt") + public void testDoWhileStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forContinue.kt") - public void testForContinue() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + public void testForContinue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forContinue.kt") + public void testForContinue_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forStatement.kt") - public void testForStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + public void testForStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forStatement.kt") + public void testForStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("forWithStep.kt") - public void testForWithStep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + public void testForWithStep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("forWithStep.kt") + public void testForWithStep_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("ifStatement.kt") - public void testIfStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + public void testIfStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("ifStatement.kt") + public void testIfStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + public void testLabeledWhile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("labeledWhile.kt") + public void testLabeledWhile_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + public void testReturnFromFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnFromFinally.kt") + public void testReturnFromFinally_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + public void testSwitchLikeWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("switchLikeWhen.kt") + public void testSwitchLikeWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + public void testThrowFromCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("throwFromCatch.kt") + public void testThrowFromCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + public void testThrowInTryWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("throwInTryWithHandleResult.kt") + public void testThrowInTryWithHandleResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + public void testWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whileStatement.kt") + public void testWhileStatement_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5547,48 +6198,111 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + public void testBreakWithNonEmptyStack_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("breakWithNonEmptyStack.kt") + public void testBreakWithNonEmptyStack_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("delegate.kt") - public void testDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + public void testDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("delegate.kt") + public void testDelegate_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + public void testDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + @TestMetadata("destructuringInLambdas.kt") + public void testDestructuringInLambdas_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + public void testSafeCallOnTwoReceiversLong_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + public void testSuspendDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + @TestMetadata("suspendDestructuringInLambdas.kt") + public void testSuspendDestructuringInLambdas_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + public void testSuspendOperatorPlusAssign_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + public void testSuspendOperatorPlusCallFromLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec") @@ -5604,68 +6318,159 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + public void testControlFlowIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controlFlowIf.kt") + public void testControlFlowIf_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + public void testControlFlowWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("controlFlowWhen.kt") + public void testControlFlowWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extention.kt") - public void testExtention() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + public void testExtention_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extention.kt") + public void testExtention_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + public void testInfixCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infixCall.kt") + public void testInfixCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + public void testInfixRecursiveCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infixRecursiveCall.kt") + public void testInfixRecursiveCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + public void testRealIteratorFoldl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realIteratorFoldl.kt") + public void testRealIteratorFoldl_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + public void testRealStringEscape_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realStringEscape.kt") + public void testRealStringEscape_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + public void testRealStringRepeat_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("realStringRepeat.kt") + public void testRealStringRepeat_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + public void testReturnInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnInParentheses.kt") + public void testReturnInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sum.kt") - public void testSum() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + public void testSum_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sum.kt") + public void testSum_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + public void testTailCallInBlockInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallInBlockInParentheses.kt") + public void testTailCallInBlockInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + public void testTailCallInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailCallInParentheses.kt") + public void testTailCallInParentheses_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + public void testWhenWithIs_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whenWithIs.kt") + public void testWhenWithIs_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } @@ -5683,53 +6488,123 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + public void testComplicatedMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("complicatedMerge.kt") + public void testComplicatedMerge_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("i2bResult.kt") - public void testI2bResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + public void testI2bResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("i2bResult.kt") + public void testI2bResult_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + public void testLoadFromBooleanArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromBooleanArray.kt") + public void testLoadFromBooleanArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + public void testLoadFromByteArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("loadFromByteArray.kt") + public void testLoadFromByteArray_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + public void testNoVariableInTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noVariableInTable.kt") + public void testNoVariableInTable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + public void testSameIconst1ManyVars_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("sameIconst1ManyVars.kt") + public void testSameIconst1ManyVars_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + public void testUsedInArrayStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInArrayStore.kt") + public void testUsedInArrayStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + public void testUsedInMethodCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInMethodCall.kt") + public void testUsedInMethodCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + public void testUsedInPutfield_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInPutfield.kt") + public void testUsedInPutfield_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + public void testUsedInVarStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("usedInVarStore.kt") + public void testUsedInVarStore_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5761,28 +6636,63 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("intercepted.kt") - public void testIntercepted() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + public void testIntercepted_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("startCoroutine.kt") - public void testStartCoroutine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + @TestMetadata("intercepted.kt") + public void testIntercepted_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + public void testStartCoroutineUninterceptedOrReturnInterception_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + public void testSuspendCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") + public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5829,53 +6739,123 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + public void testCapturedParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedParameters.kt") + public void testCapturedParameters_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("capturedVariables.kt") + public void testCapturedVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("extension.kt") - public void testExtension() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + public void testExtension_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("extension.kt") + public void testExtension_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("infix.kt") - public void testInfix() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + public void testInfix_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("infix.kt") + public void testInfix_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + public void testInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("insideLambda.kt") + public void testInsideLambda_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + public void testNestedLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + @TestMetadata("nestedLocals.kt") + public void testNestedLocals_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + public void testSimpleSuspensionPoint_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("stateMachine.kt") - public void testStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + public void testStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("stateMachine.kt") + public void testStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("withArguments.kt") - public void testWithArguments() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + public void testWithArguments_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withArguments.kt") + public void testWithArguments_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } @@ -5885,8 +6865,27 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractLightAnalysisModeTest { @TestMetadata("inlineMultiModuleOverride.kt") - public void ignoreInlineMultiModuleOverride() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + public void ignoreInlineMultiModuleOverride_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void ignoreInlineMultiModuleOverride_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } private void runTest(String testDataFilePath) throws Exception { @@ -5898,33 +6897,75 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + public void testInlineFunctionWithOptionalParam_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + @TestMetadata("inlineFunctionWithOptionalParam.kt") + public void testInlineFunctionWithOptionalParam_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + public void testInlineMultiModuleWithController_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + public void testInlineMultiModuleWithInnerInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + public void testInlineTailCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineTailCall.kt") + public void testInlineTailCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5941,8 +6982,15 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + public void testKtor_receivedMessage_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("ktor_receivedMessage.kt") + public void testKtor_receivedMessage_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5959,23 +7007,51 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("exception.kt") - public void testException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + public void testException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("exception.kt") + public void testException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineSuspendFunction.kt") + public void testInlineSuspendFunction_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendInCycle.kt") + public void testSuspendInCycle_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -5992,83 +7068,195 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("dispatchResume.kt") + public void testDispatchResume_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("inline.kt") - public void testInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + @TestMetadata("handleException.kt") + public void testHandleException_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + public void testInlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("inline.kt") + public void testInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inline.kt") + public void testInline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("member.kt") - public void testMember() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + public void testMember_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("member.kt") + public void testMember_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + public void testNoinlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("noinlineTwoReceivers.kt") + public void testNoinlineTwoReceivers_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("openFunWithJava.kt") - public void testOpenFunWithJava() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + public void testOpenFunWithJava_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("openFunWithJava.kt") + public void testOpenFunWithJava_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("operators.kt") - public void testOperators() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + public void testOperators_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("operators.kt") + public void testOperators_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + public void testPrivateFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("privateFunctions.kt") + public void testPrivateFunctions_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + public void testPrivateInFile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("privateInFile.kt") + public void testPrivateInFile_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + public void testReturnNoSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("returnNoSuspend.kt") + public void testReturnNoSuspend_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + public void testSuperCallAbstractClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + public void testSuperCallInterface_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("withVariables.kt") - public void testWithVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + public void testWithVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("withVariables.kt") + public void testWithVariables_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6085,18 +7273,39 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("localVal.kt") - public void testLocalVal() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + public void testLocalVal_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("localVal.kt") + public void testLocalVal_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("manyParameters.kt") - public void testManyParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + public void testManyParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("manyParameters.kt") + public void testManyParameters_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendModifier.kt") @@ -6118,38 +7327,87 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("crossinline.kt") - public void testCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + public void testCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("crossinline.kt") + public void testCrossinline_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineWithStateMachine.kt") - public void testInlineWithStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + public void testInlineWithStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineWithStateMachine.kt") + public void testInlineWithStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + public void testInlineWithoutStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineWithoutStateMachine.kt") + public void testInlineWithoutStateMachine_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + public void testTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tryCatch.kt") + public void testTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unreachable.kt") - public void testUnreachable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + public void testUnreachable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unreachable.kt") + public void testUnreachable_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("whenUnit.kt") - public void testWhenUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + public void testWhenUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("whenUnit.kt") + public void testWhenUnit_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6166,23 +7424,51 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + public void testSuspendWithIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithIf.kt") + public void testSuspendWithIf_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + public void testSuspendWithTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithTryCatch.kt") + public void testSuspendWithTryCatch_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + public void testSuspendWithWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendWithWhen.kt") + public void testSuspendWithWhen_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("tailInlining.kt") - public void testTailInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + public void testTailInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("tailInlining.kt") + public void testTailInlining_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6199,28 +7485,63 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + public void testCoroutineNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineNonLocalReturn.kt") + public void testCoroutineNonLocalReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + public void testCoroutineReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("coroutineReturn.kt") + public void testCoroutineReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + public void testSuspendNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendNonLocalReturn.kt") + public void testSuspendNonLocalReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + public void testSuspendReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendReturn.kt") + public void testSuspendReturn_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + public void testUnitSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("unitSafeCall.kt") + public void testUnitSafeCall_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } @@ -6237,13 +7558,27 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("kt19475.kt") - public void testKt19475() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + public void testKt19475_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("kt19475.kt") + public void testKt19475_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + public void testNullSpilling_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nullSpilling.kt") + public void testNullSpilling_1_3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines"); } } } diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 8f90af6959b..4fadbda5b01 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.jvm.runtime @@ -130,7 +119,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { targetFile.writeText(adaptJavaSource(text)) return targetFile } - }) + }, "") LoadDescriptorUtil.compileJavaWithAnnotationsJar(sources, tmpdir) } fileName.endsWith(".kt") -> { diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java index f04331038e2..0327de7b7a7 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.generators.tests.generator; @@ -20,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.generators.util.CoroutinesKt; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.utils.Printer; @@ -146,10 +136,16 @@ public class SimpleTestClassModel implements TestClassModel { public Collection getMethods() { if (testMethods == null) { if (!rootFile.isDirectory()) { - testMethods = Collections.singletonList(new SimpleTestMethodModel( - rootFile, rootFile, filenamePattern, - checkFilenameStartsLowerCase, targetBackend, skipIgnored - )); + if (CoroutinesKt.isCommonCoroutineTest(rootFile)) { + testMethods = CoroutinesKt.createCommonCoroutinesTestMethodModels(rootFile, rootFile, doTestMethodName, filenamePattern, + checkFilenameStartsLowerCase, targetBackend, + skipIgnored); + } + else { + testMethods = Collections.singletonList(new SimpleTestMethodModel( + rootFile, rootFile, filenamePattern, checkFilenameStartsLowerCase, targetBackend, skipIgnored + )); + } } else { List result = new ArrayList<>(); @@ -167,9 +163,16 @@ public class SimpleTestClassModel implements TestClassModel { continue; } - result.add(new SimpleTestMethodModel( - rootFile, file, filenamePattern, - checkFilenameStartsLowerCase, targetBackend, skipIgnored)); + if (!file.isDirectory() && CoroutinesKt.isCommonCoroutineTest(file)) { + result.addAll(CoroutinesKt.createCommonCoroutinesTestMethodModels(rootFile, file, doTestMethodName, + filenamePattern, + checkFilenameStartsLowerCase, + targetBackend, skipIgnored)); + } + else { + result.add(new SimpleTestMethodModel(rootFile, file, filenamePattern, + checkFilenameStartsLowerCase, targetBackend, skipIgnored)); + } } } } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java index 69359d7e8ef..bb50a4d41fb 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java @@ -25,11 +25,11 @@ public class SimpleTestMethodModel implements TestMethodModel { @NotNull private final File rootDir; @NotNull - private final File file; + protected final File file; @NotNull private final Pattern filenamePattern; @NotNull - private final TargetBackend targetBackend; + protected final TargetBackend targetBackend; private final boolean skipIgnored; diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/coroutines.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/coroutines.kt new file mode 100644 index 00000000000..b03f1680a41 --- /dev/null +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/coroutines.kt @@ -0,0 +1,111 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.generators.util + +import org.jetbrains.kotlin.generators.tests.generator.MethodModel +import org.jetbrains.kotlin.generators.tests.generator.SimpleTestMethodModel +import org.jetbrains.kotlin.test.InTextDirectivesUtils.isIgnoredTarget +import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.utils.Printer +import java.io.File +import java.util.regex.Pattern + +class CoroutinesTestModel( + rootDir: File, + file: File, + private val doTestMethodName: String, + filenamePattern: Pattern, + checkFilenameStartsLowerCase: Boolean?, + targetBackend: TargetBackend, + skipIgnored: Boolean, + private val isLanguageVersion1_3: Boolean +) : SimpleTestMethodModel( + rootDir, + file, + filenamePattern, + checkFilenameStartsLowerCase, + targetBackend, + skipIgnored +) { + override val name: String + get() = super.name + if (isLanguageVersion1_3) "_1_3" else "_1_2" + + override fun generateBody(p: Printer) { + val filePath = KotlinTestUtils.getFilePath(file) + if (file.isDirectory) "/" else "" + p.println("String fileName = KotlinTestUtils.navigationMetadata(\"", filePath, "\");") + + if (isIgnoredTarget(targetBackend, file)) { + p.println("try {") + p.pushIndent() + } + + val packageName = if (isLanguageVersion1_3) "kotlin.coroutines" else "kotlin.coroutines.experimental" + p.println(doTestMethodName + "WithCoroutinesPackageReplacement", "(fileName, \"$packageName\");") + + if (isIgnoredTarget(targetBackend, file)) { + p.popIndent() + p.println("}") + p.println("catch (Throwable ignore) {") + p.pushIndent() + p.println("return;") + p.popIndent() + p.println("}") + p.println("throw new AssertionError(\"Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.\");") + } + } +} + +fun isCommonCoroutineTest(file: File): Boolean { + return file.readLines().any { it.startsWith("// COMMON_COROUTINES_TEST") } +} + +fun createCommonCoroutinesTestMethodModels( + rootDir: File, + file: File, + doTestMethodName: String, + filenamePattern: Pattern, + checkFilenameStartsLowerCase: Boolean?, + targetBackend: TargetBackend, + skipIgnored: Boolean +): Collection { + return if (targetBackend == TargetBackend.JS) + listOf( + CoroutinesTestModel( + rootDir, + file, + doTestMethodName, + filenamePattern, + checkFilenameStartsLowerCase, + targetBackend, + skipIgnored, + false + ) + ) + else + listOf( + CoroutinesTestModel( + rootDir, + file, + doTestMethodName, + filenamePattern, + checkFilenameStartsLowerCase, + targetBackend, + skipIgnored, + true + ), + CoroutinesTestModel( + rootDir, + file, + doTestMethodName, + filenamePattern, + checkFilenameStartsLowerCase, + targetBackend, + skipIgnored, + false + ) + ) +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt index 773af521276..8ba7905e86d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.idea.caches.resolve @@ -124,10 +113,10 @@ abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTestCase( private fun testLightClass(expected: File, testData: File, normalize: (String) -> String, findLightClass: (String) -> PsiClass?) { LightClassTestCommon.testLightClass( - expected, - testData, - findLightClass, - normalizeText = { text -> + expected, + testData, + findLightClass = findLightClass, + normalizeText = { text -> //NOTE: ide and compiler differ in names generated for parameters with unspecified names text .replace("java.lang.String s,", "java.lang.String p,") diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 127fc394125..4a47feb557b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -133,7 +133,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest } return TestFile(fileName, text) } - }) + }, "") val afterFile = subFiles.firstOrNull { file -> file.path.contains(".after") } val beforeFile = subFiles.firstOrNull { file -> file.path.contains(".before") }!! diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt index efd9f343e02..979fb6d9e7f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.js.test @@ -56,7 +45,7 @@ abstract class AbstractJsLineNumberTest : KotlinTestWithEnvironment() { val sourceCode = file.readText() TestFileFactoryImpl().use { testFactory -> - val inputFiles = KotlinTestUtils.createTestFiles(file.name, sourceCode, testFactory, true) + val inputFiles = KotlinTestUtils.createTestFiles(file.name, sourceCode, testFactory, true, "") val modules = inputFiles .map { it.module }.distinct() .associateBy { it.name } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 4217bbdbead..4ed59ae60a9 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -90,16 +90,24 @@ abstract class BasicBoxTest( doTest(filePath, "OK", MainCallParameters.noCall()) } - fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters) { + fun doTestWithCoroutinesPackageReplacement(filePath: String, packageName: String) { + if (packageName == "kotlin.coroutines") return // TODO: Support JS in kotlin-stdlib-coroutines + doTest(filePath, "OK", MainCallParameters.noCall(), packageName) + } + + fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters, packageName: String = "") { val file = File(filePath) val outputDir = getOutputDir(file) - val fileContent = KotlinTestUtils.doLoadFile(file) + var fileContent = KotlinTestUtils.doLoadFile(file) + if (packageName.isNotEmpty()) { + fileContent = fileContent.replace("COROUTINES_PACKAGE", packageName) + } val outputPrefixFile = getOutputPrefixFile(filePath) val outputPostfixFile = getOutputPostfixFile(filePath) TestFileFactoryImpl().use { testFactory -> - val inputFiles = KotlinTestUtils.createTestFiles(file.name, fileContent, testFactory, true) + val inputFiles = KotlinTestUtils.createTestFiles(file.name, fileContent, testFactory, true, "") val modules = inputFiles .map { it.module }.distinct() .map { it.name to it }.toMap() diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index bba3976bd39..8e871ad5a86 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -3658,8 +3658,9 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("withCoroutines.kt") - public void testWithCoroutines() throws Exception { - runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + public void testWithCoroutines_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -4828,392 +4829,475 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + public void test32defaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + public void testAccessorForSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true); } - @TestMetadata("asyncIterator.kt") - public void testAsyncIterator() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); - } - @TestMetadata("asyncIteratorNullMerge.kt") - public void testAsyncIteratorNullMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + public void testAsyncIteratorNullMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorNullMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("asyncIteratorToList.kt") - public void testAsyncIteratorToList() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + public void testAsyncIteratorToList_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIteratorToList.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("asyncIterator.kt") + public void testAsyncIterator_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/asyncIterator.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("await.kt") - public void testAwait() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/await.kt"); - } - - @TestMetadata("beginWithException.kt") - public void testBeginWithException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + public void testAwait_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/await.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + public void testBeginWithExceptionNoHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("beginWithException.kt") + public void testBeginWithException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + public void testCoercionToUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + public void testControllerAccessFromInnerLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + public void testCoroutineContextInInlinedLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + public void testCreateCoroutineSafe_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + public void testCreateCoroutinesOnManualInstances_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + public void testCrossInlineWithCapturedOuterReceiver_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + public void testDefaultParametersInSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + public void testEmptyClosure_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + public void testFalseUnitCoercion_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("generate.kt") - public void testGenerate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/generate.kt"); + public void testGenerate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/generate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + public void testHandleResultCallEmptyBody_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + public void testHandleResultNonUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + public void testHandleResultSuspended_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + public void testIndirectInlineUsedAsNonInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + public void testInlineFunInGenericClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + public void testInlineGenericFunCalledFromSubclass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + public void testInlinedTryCatchFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + public void testInnerSuspensionCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + public void testInstanceOfContinuation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + public void testIterateOverArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("kt12958.kt") - public void testKt12958() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); + public void testKt12958_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt12958.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("kt15016.kt") - public void testKt15016() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); + public void testKt15016_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15016.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("kt15017.kt") - public void testKt15017() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); + public void testKt15017_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15017.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("kt15930.kt") - public void testKt15930() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); + public void testKt15930_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt15930.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("kt21605.kt") - public void testKt21605() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); + public void testKt21605_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/kt21605.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + public void testLastExpressionIsLoop_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + public void testLastStatementInc_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + public void testLastStementAssignment_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + public void testLastUnitExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("localCallableRef.kt") - public void testLocalCallableRef() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + public void testLocalCallableRef_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localCallableRef.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("localDelegate.kt") - public void testLocalDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + public void testLocalDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localDelegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + public void testLongRangeInSuspendCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + public void testLongRangeInSuspendFun_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); - } - - @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + public void testMergeNullAndString_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + public void testMultipleInvokeCallsInsideInlineLambda1_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + public void testMultipleInvokeCallsInsideInlineLambda2_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + public void testMultipleInvokeCallsInsideInlineLambda3_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("multipleInvokeCalls.kt") + public void testMultipleInvokeCalls_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + public void testNestedTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); - } - - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + public void testNoSuspensionPoints_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + public void testOverrideDefaultArgument_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + public void testRecursiveSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simple.kt"); + public void testReturnByLabel_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simpleException.kt") - public void testSimpleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); + public void testSimpleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + public void testSimpleWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + public void testStatementLikeLastExpression_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + public void testSuspendCoroutineFromStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + public void testSuspendDefaultImpl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + public void testSuspendDelegation_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + public void testSuspendFromInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + public void testSuspendFunImportedFromObject_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") + public void testSuspendInTheMiddleOfObjectConstruction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + public void testSuspensionInsideSafeCallWithElvis_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + public void testTryCatchFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + public void testTryCatchWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + public void testTryFinallyInsideInlineLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); - } - - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + public void testTryFinallyWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("varValueConflictsWithTable.kt") + public void testVarValueConflictsWithTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("compiler/testData/codegen/box/coroutines/controlFlow") @@ -5229,68 +5313,81 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("breakFinally.kt") - public void testBreakFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + public void testBreakFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + public void testBreakStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + public void testDoWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("forContinue.kt") - public void testForContinue() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + public void testForContinue_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("forStatement.kt") - public void testForStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + public void testForStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("forWithStep.kt") - public void testForWithStep() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + public void testForWithStep_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("ifStatement.kt") - public void testIfStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + public void testIfStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + public void testLabeledWhile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + public void testReturnFromFinally_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + public void testSwitchLikeWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + public void testThrowFromCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + public void testThrowInTryWithHandleResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + public void testWhileStatement_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5307,48 +5404,57 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + public void testBreakWithNonEmptyStack_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("delegate.kt") - public void testDelegate() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + public void testDelegate_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); - } - - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + public void testDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + public void testSafeCallOnTwoReceiversLong_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); - } - - @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + public void testSuspendDestructuringInLambdas_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + public void testSuspendOperatorPlusAssign_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + public void testSuspendOperatorPlusCallFromLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("suspendOperatorPlus.kt") + public void testSuspendOperatorPlus_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec") @@ -5364,68 +5470,81 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + public void testControlFlowIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + public void testControlFlowWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("extention.kt") - public void testExtention() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + public void testExtention_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + public void testInfixCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + public void testInfixRecursiveCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + public void testRealIteratorFoldl_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + public void testRealStringEscape_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + public void testRealStringRepeat_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + public void testReturnInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("sum.kt") - public void testSum() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + public void testSum_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + public void testTailCallInBlockInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + public void testTailCallInParentheses_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + public void testWhenWithIs_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } } @@ -5443,43 +5562,51 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + public void testComplicatedMerge_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("i2bResult.kt") - public void testI2bResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + public void testI2bResult_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + public void testLoadFromBooleanArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + public void testLoadFromByteArray_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + public void testNoVariableInTable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + public void testSameIconst1ManyVars_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + public void testUsedInMethodCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + public void testUsedInVarStore_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5511,28 +5638,33 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("intercepted.kt") - public void testIntercepted() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); - } - - @TestMetadata("startCoroutine.kt") - public void testStartCoroutine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + public void testIntercepted_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + public void testStartCoroutineUninterceptedOrReturnInterception_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("startCoroutine.kt") + public void testStartCoroutine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + public void testSuspendCoroutineUninterceptedOrReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5579,53 +5711,63 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + public void testCapturedParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + public void testCapturedVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("extension.kt") - public void testExtension() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + public void testExtension_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("infix.kt") - public void testInfix() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + public void testInfix_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + public void testInsideLambda_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + public void testNestedLocals_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + public void testSimpleSuspensionPoint_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("simple.kt") + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("stateMachine.kt") - public void testStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + public void testStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("withArguments.kt") - public void testWithArguments() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + public void testWithArguments_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } } @@ -5643,38 +5785,45 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); - } - - @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + public void testInlineFunctionWithOptionalParam_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + public void testInlineMultiModuleOverride_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + public void testInlineMultiModuleWithController_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + public void testInlineMultiModuleWithInnerInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inlineMultiModule.kt") + public void testInlineMultiModule_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + public void testInlineTailCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5691,8 +5840,9 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + public void testKtor_receivedMessage_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5709,23 +5859,27 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("exception.kt") - public void testException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + public void testException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + public void testInlineSuspendFunction_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + public void testSuspendInCycle_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5742,78 +5896,93 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("dispatchResume.kt") - public void testDispatchResume() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + public void testDispatchResume_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("handleException.kt") - public void testHandleException() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); - } - - @TestMetadata("inline.kt") - public void testInline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + public void testHandleException_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + public void testInlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("inline.kt") + public void testInline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("member.kt") - public void testMember() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + public void testMember_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + public void testNoinlineTwoReceivers_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("operators.kt") - public void testOperators() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + public void testOperators_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + public void testPrivateFunctions_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + public void testPrivateInFile_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + public void testReturnNoSuspend_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); - } - - @TestMetadata("superCall.kt") - public void testSuperCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + public void testSuperCallAbstractClass_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + public void testSuperCallInterface_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + + @TestMetadata("superCall.kt") + public void testSuperCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("withVariables.kt") - public void testWithVariables() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + public void testWithVariables_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5830,18 +5999,21 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("localVal.kt") - public void testLocalVal() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + public void testLocalVal_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("manyParameters.kt") - public void testManyParameters() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + public void testManyParameters_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendModifier.kt") @@ -5863,38 +6035,51 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("crossinline.kt") - public void testCrossinline() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + public void testCrossinline_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); + try { + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); + } + catch (Throwable ignore) { + return; + } + throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } @TestMetadata("inlineWithStateMachine.kt") - public void testInlineWithStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + public void testInlineWithStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + public void testInlineWithoutStateMachine_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + public void testSimple_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/simple.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tryCatch.kt") - public void testTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + public void testTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("unreachable.kt") - public void testUnreachable() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + public void testUnreachable_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("whenUnit.kt") - public void testWhenUnit() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + public void testWhenUnit_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/whenUnit.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5911,23 +6096,27 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + public void testSuspendWithIf_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + public void testSuspendWithTryCatch_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + public void testSuspendWithWhen_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("tailInlining.kt") - public void testTailInlining() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + public void testTailInlining_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5944,28 +6133,33 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + public void testCoroutineNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + public void testCoroutineReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + public void testSuspendNonLocalReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + public void testSuspendReturn_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + public void testUnitSafeCall_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } @@ -5982,13 +6176,15 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("kt19475.kt") - public void testKt19475() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + public void testKt19475_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + public void testNullSpilling_1_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); + doTestWithCoroutinesPackageReplacement(fileName, "kotlin.coroutines.experimental"); } } }