diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java index f9f25fdec03..148898ae8df 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestWithStdlibGenerated.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -1659,10 +1658,6 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @@ -1788,8 +1783,8 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt", "kotlin.coroutines"); + public void testNoDefaultCoroutineImports() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); } @TestMetadata("nonLocalSuspension.kt") @@ -1818,8 +1813,8 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt", "kotlin.coroutines"); + public void testSuspendApplicability() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); } @TestMetadata("suspendConflictsWithNoSuspend.kt") @@ -1848,8 +1843,8 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("suspendCovarianJavaOverride.kt") - public void testSuspendCovarianJavaOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt", "kotlin.coroutines"); + public void testSuspendCovarianJavaOverride() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt"); } @TestMetadata("suspendDestructuring.kt") @@ -1868,23 +1863,23 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt", "kotlin.coroutines"); + public void testSuspendFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); } @TestMetadata("suspendJavaImplementationFromDifferentClass.kt") - public void testSuspendJavaImplementationFromDifferentClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt", "kotlin.coroutines"); + public void testSuspendJavaImplementationFromDifferentClass() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt"); } @TestMetadata("suspendJavaOverrides.kt") - public void testSuspendJavaOverrides_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt", "kotlin.coroutines"); + public void testSuspendJavaOverrides() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt"); } @TestMetadata("suspendLambda.kt") - public void testSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt", "kotlin.coroutines"); + public void testSuspendLambda() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt"); } @TestMetadata("suspendOverridability.kt") @@ -1945,10 +1940,6 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @@ -1964,8 +1955,8 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("property.kt") - public void testProperty_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt", "kotlin.coroutines"); + public void testProperty() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt"); } @TestMetadata("suspendConversionForCallableReferences.kt") @@ -2265,72 +2256,68 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInInlineCrossinline() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); } } @@ -2370,32 +2357,28 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInRestrictSuspension() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt", "kotlin.coroutines"); + public void testAllMembersAllowed() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); } @TestMetadata("extensions.kt") - public void testExtensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt", "kotlin.coroutines"); + public void testExtensions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); } @TestMetadata("memberExtension.kt") - public void testMemberExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt", "kotlin.coroutines"); + public void testMemberExtension() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt"); } @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt", "kotlin.coroutines"); + public void testNotRelatedFun() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); } @TestMetadata("outerYield_1_2.kt") @@ -2409,18 +2392,18 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("sameInstance.kt") - public void testSameInstance_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt", "kotlin.coroutines"); + public void testSameInstance() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); } @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt", "kotlin.coroutines"); + public void testSimpleForbidden() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); } @TestMetadata("wrongEnclosingFunction.kt") - public void testWrongEnclosingFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt", "kotlin.coroutines"); + public void testWrongEnclosingFunction() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt"); } } @@ -2515,17 +2498,13 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInTailCalls() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("forbidden.kt") - public void testForbidden_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt", "kotlin.coroutines"); + public void testForbidden() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); } @TestMetadata("localFunctions.kt") @@ -2549,13 +2528,13 @@ public class FirOldFrontendDiagnosticsTestWithStdlibGenerated extends AbstractFi } @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt", "kotlin.coroutines"); + public void testTryCatch() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); } @TestMetadata("valid.kt") - public void testValid_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt", "kotlin.coroutines"); + public void testValid() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); } } } diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java index dca0ac2c850..0c5b20dbeba 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/FirCompileKotlinAgainstKotlinTestGenerated.java @@ -25,10 +25,6 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -99,8 +95,8 @@ public class FirCompileKotlinAgainstKotlinTestGenerated extends AbstractFirCompi } @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt", "kotlin.coroutines"); + public void testCoroutinesBinary() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); } @TestMetadata("defaultConstructor.kt") diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java index 7f455b6029e..20674d12e13 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java @@ -934,10 +934,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -1033,23 +1029,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendFunctionAssertionDisabled.kt") - public void testSuspendFunctionAssertionDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt"); } @TestMetadata("suspendFunctionAssertionsEnabled.kt") - public void testSuspendFunctionAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt"); } @TestMetadata("suspendLambdaAssertionsDisabled.kt") - public void testSuspendLambdaAssertionsDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt"); } @TestMetadata("suspendLambdaAssertionsEnabled.kt") - public void testSuspendLambdaAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt"); } } } @@ -4845,10 +4841,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -4898,14 +4890,14 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutinesNoStdLib.kt") + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -5351,10 +5343,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -5400,8 +5388,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -6535,27 +6523,28 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } + @TestMetadata("async.kt") + public void testAsync() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/async.kt"); + } + @TestMetadata("asyncException.kt") - public void testAsyncException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/asyncException.kt", "kotlin.coroutines"); + public void testAsyncException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/asyncException.kt"); } @TestMetadata("asyncIteratorNullMerge_1_3.kt") @@ -6573,24 +6562,19 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt"); } - @TestMetadata("async.kt") - public void testAsync_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/async.kt", "kotlin.coroutines"); - } - @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -6614,28 +6598,28 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("coroutineToString.kt") @@ -6644,18 +6628,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + } + + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("defaultParametersInSuspendWithJvmOverloads.kt") @@ -6663,19 +6652,14 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); - } - @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -6684,8 +6668,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -6694,38 +6678,38 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("illegalState.kt") @@ -6734,93 +6718,93 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") - public void testInlineFunctionInMultifileClassUnoptimized_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineFunctionInMultifileClass.kt") - public void testInlineFunctionInMultifileClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt", "kotlin.coroutines"); + public void testInlineFunctionInMultifileClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt"); + } + + @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") + public void testInlineFunctionInMultifileClassUnoptimized() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -6849,23 +6833,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -6874,53 +6858,53 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -6928,24 +6912,24 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("restrictedSuspendLambda.kt") @@ -6954,13 +6938,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + 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"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -6969,18 +6958,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -6989,13 +6973,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendCovariantJavaOverrides.kt") @@ -7004,23 +6988,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -7034,23 +7018,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendJavaOverrides.kt") @@ -7064,8 +7048,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspendReturningPlatformType.kt") @@ -7073,14 +7057,14 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/suspendReturningPlatformType.kt"); } - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); } - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -7089,38 +7073,38 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -7131,27 +7115,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -7163,62 +7143,58 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -7227,58 +7203,58 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -7343,17 +7319,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -7362,13 +7334,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("funInterface.kt") @@ -7377,8 +7349,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -7396,19 +7368,19 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -7417,23 +7389,23 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -7444,17 +7416,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("fromJava.kt") @@ -7540,77 +7508,73 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -7640,10 +7604,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -7659,58 +7619,58 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -7824,8 +7784,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -7834,28 +7794,28 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -7872,10 +7832,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -7891,58 +7847,58 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8056,8 +8012,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8066,28 +8022,28 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8104,10 +8060,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -8123,58 +8075,58 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8273,8 +8225,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8283,28 +8235,28 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8322,22 +8274,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -8346,43 +8294,43 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -8394,52 +8342,48 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + 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("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -8451,37 +8395,33 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("objectWithSeveralSuspends.kt") - public void testObjectWithSeveralSuspends_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt", "kotlin.coroutines"); + public void testObjectWithSeveralSuspends() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt"); } @TestMetadata("returnLambda.kt") - public void testReturnLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt", "kotlin.coroutines"); + public void testReturnLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt"); } @TestMetadata("returnObject.kt") - public void testReturnObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt", "kotlin.coroutines"); + public void testReturnObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt"); } @TestMetadata("severalCaptures.kt") - public void testSeveralCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt", "kotlin.coroutines"); + public void testSeveralCaptures() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt"); } @TestMetadata("suspendInlineWithCrossinline.kt") - public void testSuspendInlineWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt", "kotlin.coroutines"); + public void testSuspendInlineWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt"); } } @@ -8505,17 +8445,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } } @@ -8527,42 +8463,38 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("rec.kt") @@ -8570,24 +8502,24 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt"); } - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); } - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -8600,47 +8532,43 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("inlineWithJava.kt") @@ -8649,8 +8577,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -8662,17 +8590,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -8712,42 +8636,38 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); + } + + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -8792,22 +8712,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -8815,24 +8731,24 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("openFunWithJava.kt") @@ -8841,53 +8757,53 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -8899,37 +8815,33 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + } + + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -8941,10 +8853,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -8955,8 +8863,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithStateMachine.kt") @@ -8965,13 +8873,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("interfaceDelegation.kt") @@ -9004,16 +8912,16 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tailSuspendUnitFun.kt"); } + @TestMetadata("tryCatch.kt") + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + } + @TestMetadata("tryCatchTailCall.kt") public void testTryCatchTailCall() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatchTailCall.kt"); } - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); - } - @TestMetadata("unreachable.kt") public void testUnreachable() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); @@ -9101,32 +9009,28 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -9138,22 +9042,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -9167,18 +9067,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -9190,10 +9090,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -9204,18 +9100,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -20396,10 +20292,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -20450,8 +20342,8 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT } @TestMetadata("suspendFunction.kt") - public void testSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt", "kotlin.coroutines"); + public void testSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt"); } } diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java index 3ed7216e2d4..cab38e83de3 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java @@ -3967,22 +3967,18 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -3991,18 +3987,18 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4011,18 +4007,18 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4031,38 +4027,38 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4071,18 +4067,18 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4096,23 +4092,23 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4171,17 +4167,13 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4189,14 +4181,14 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4264,52 +4256,48 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4321,77 +4309,73 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4400,43 +4384,43 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java index 1188525c21b..33848c6fe9a 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java @@ -1413,10 +1413,6 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest { KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -1447,8 +1443,8 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest { } @TestMetadata("returnUnitInLambda.kt") - public void testReturnUnitInLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt", "kotlin.coroutines"); + public void testReturnUnitInLambda() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt"); } @TestMetadata("suspendMain.kt") @@ -1626,62 +1622,58 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest { KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: "); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index 8889dc53890..6411620cb77 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -1659,10 +1658,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @@ -1788,13 +1783,8 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt", "kotlin.coroutines"); + public void testNoDefaultCoroutineImports() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); } @TestMetadata("nonLocalSuspension.kt") @@ -1823,13 +1813,8 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt", "kotlin.coroutines"); + public void testSuspendApplicability() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); } @TestMetadata("suspendConflictsWithNoSuspend.kt") @@ -1858,13 +1843,8 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("suspendCovarianJavaOverride.kt") - public void testSuspendCovarianJavaOverride_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCovarianJavaOverride.kt") - public void testSuspendCovarianJavaOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt", "kotlin.coroutines"); + public void testSuspendCovarianJavaOverride() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt"); } @TestMetadata("suspendDestructuring.kt") @@ -1883,43 +1863,23 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt", "kotlin.coroutines"); + public void testSuspendFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); } @TestMetadata("suspendJavaImplementationFromDifferentClass.kt") - public void testSuspendJavaImplementationFromDifferentClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendJavaImplementationFromDifferentClass.kt") - public void testSuspendJavaImplementationFromDifferentClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt", "kotlin.coroutines"); + public void testSuspendJavaImplementationFromDifferentClass() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt"); } @TestMetadata("suspendJavaOverrides.kt") - public void testSuspendJavaOverrides_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendJavaOverrides.kt") - public void testSuspendJavaOverrides_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt", "kotlin.coroutines"); + public void testSuspendJavaOverrides() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt"); } @TestMetadata("suspendLambda.kt") - public void testSuspendLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambda.kt") - public void testSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt", "kotlin.coroutines"); + public void testSuspendLambda() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt"); } @TestMetadata("suspendOverridability.kt") @@ -1980,10 +1940,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @@ -1999,13 +1955,8 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("property.kt") - public void testProperty_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("property.kt") - public void testProperty_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt", "kotlin.coroutines"); + public void testProperty() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt"); } @TestMetadata("suspendConversionForCallableReferences.kt") @@ -2305,132 +2256,68 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInInlineCrossinline() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); } } @@ -2470,52 +2357,28 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInRestrictSuspension() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt", "kotlin.coroutines"); + public void testAllMembersAllowed() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); } @TestMetadata("extensions.kt") - public void testExtensions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("extensions.kt") - public void testExtensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt", "kotlin.coroutines"); + public void testExtensions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); } @TestMetadata("memberExtension.kt") - public void testMemberExtension_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("memberExtension.kt") - public void testMemberExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt", "kotlin.coroutines"); + public void testMemberExtension() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt"); } @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt", "kotlin.coroutines"); + public void testNotRelatedFun() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); } @TestMetadata("outerYield_1_2.kt") @@ -2529,33 +2392,18 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("sameInstance.kt") - public void testSameInstance_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sameInstance.kt") - public void testSameInstance_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt", "kotlin.coroutines"); + public void testSameInstance() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); } @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt", "kotlin.coroutines"); + public void testSimpleForbidden() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); } @TestMetadata("wrongEnclosingFunction.kt") - public void testWrongEnclosingFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("wrongEnclosingFunction.kt") - public void testWrongEnclosingFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt", "kotlin.coroutines"); + public void testWrongEnclosingFunction() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt"); } } @@ -2650,22 +2498,13 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInTailCalls() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("forbidden.kt") - public void testForbidden_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forbidden.kt") - public void testForbidden_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt", "kotlin.coroutines"); + public void testForbidden() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); } @TestMetadata("localFunctions.kt") @@ -2689,23 +2528,13 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } @TestMetadata("tryCatch.kt") - public void testTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt", "kotlin.coroutines"); + public void testTryCatch() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); } @TestMetadata("valid.kt") - public void testValid_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("valid.kt") - public void testValid_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt", "kotlin.coroutines"); + public void testValid() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java index d4ef163daa6..eff4688ebf6 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.checkers.javac; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -1659,10 +1658,6 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @@ -1788,13 +1783,8 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noDefaultCoroutineImports.kt") - public void testNoDefaultCoroutineImports_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt", "kotlin.coroutines"); + public void testNoDefaultCoroutineImports() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.kt"); } @TestMetadata("nonLocalSuspension.kt") @@ -1823,13 +1813,8 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendApplicability.kt") - public void testSuspendApplicability_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt", "kotlin.coroutines"); + public void testSuspendApplicability() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.kt"); } @TestMetadata("suspendConflictsWithNoSuspend.kt") @@ -1858,13 +1843,8 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("suspendCovarianJavaOverride.kt") - public void testSuspendCovarianJavaOverride_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCovarianJavaOverride.kt") - public void testSuspendCovarianJavaOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt", "kotlin.coroutines"); + public void testSuspendCovarianJavaOverride() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt"); } @TestMetadata("suspendDestructuring.kt") @@ -1883,43 +1863,23 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunctions.kt") - public void testSuspendFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt", "kotlin.coroutines"); + public void testSuspendFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt"); } @TestMetadata("suspendJavaImplementationFromDifferentClass.kt") - public void testSuspendJavaImplementationFromDifferentClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendJavaImplementationFromDifferentClass.kt") - public void testSuspendJavaImplementationFromDifferentClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt", "kotlin.coroutines"); + public void testSuspendJavaImplementationFromDifferentClass() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt"); } @TestMetadata("suspendJavaOverrides.kt") - public void testSuspendJavaOverrides_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendJavaOverrides.kt") - public void testSuspendJavaOverrides_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt", "kotlin.coroutines"); + public void testSuspendJavaOverrides() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt"); } @TestMetadata("suspendLambda.kt") - public void testSuspendLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambda.kt") - public void testSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt", "kotlin.coroutines"); + public void testSuspendLambda() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendLambda.kt"); } @TestMetadata("suspendOverridability.kt") @@ -1980,10 +1940,6 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @@ -1999,13 +1955,8 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("property.kt") - public void testProperty_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("property.kt") - public void testProperty_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt", "kotlin.coroutines"); + public void testProperty() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/property.kt"); } @TestMetadata("suspendConversionForCallableReferences.kt") @@ -2305,132 +2256,68 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInInlineCrossinline() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineOrdinary.kt") - public void testInlineOrdinaryOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineOrdinary.kt") - public void testInlineOrdinaryOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfOrdinary.kt") - public void testInlineOrdinaryOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfOrdinary.kt"); } @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfSuspend.kt") - public void testInlineOrdinaryOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineOrdinaryOfSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/inlineCrossinline/inlineSuspendOfSuspend.kt"); } } @@ -2470,52 +2357,28 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInRestrictSuspension() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("allMembersAllowed.kt") - public void testAllMembersAllowed_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt", "kotlin.coroutines"); + public void testAllMembersAllowed() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.kt"); } @TestMetadata("extensions.kt") - public void testExtensions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("extensions.kt") - public void testExtensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt", "kotlin.coroutines"); + public void testExtensions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/extensions.kt"); } @TestMetadata("memberExtension.kt") - public void testMemberExtension_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("memberExtension.kt") - public void testMemberExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt", "kotlin.coroutines"); + public void testMemberExtension() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/memberExtension.kt"); } @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("notRelatedFun.kt") - public void testNotRelatedFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt", "kotlin.coroutines"); + public void testNotRelatedFun() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/notRelatedFun.kt"); } @TestMetadata("outerYield_1_2.kt") @@ -2529,33 +2392,18 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("sameInstance.kt") - public void testSameInstance_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sameInstance.kt") - public void testSameInstance_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt", "kotlin.coroutines"); + public void testSameInstance() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/sameInstance.kt"); } @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simpleForbidden.kt") - public void testSimpleForbidden_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt", "kotlin.coroutines"); + public void testSimpleForbidden() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/simpleForbidden.kt"); } @TestMetadata("wrongEnclosingFunction.kt") - public void testWrongEnclosingFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("wrongEnclosingFunction.kt") - public void testWrongEnclosingFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt", "kotlin.coroutines"); + public void testWrongEnclosingFunction() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/wrongEnclosingFunction.kt"); } } @@ -2650,22 +2498,13 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInTailCalls() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); } @TestMetadata("forbidden.kt") - public void testForbidden_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forbidden.kt") - public void testForbidden_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt", "kotlin.coroutines"); + public void testForbidden() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/forbidden.kt"); } @TestMetadata("localFunctions.kt") @@ -2689,23 +2528,13 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } @TestMetadata("tryCatch.kt") - public void testTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt", "kotlin.coroutines"); + public void testTryCatch() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/tryCatch.kt"); } @TestMetadata("valid.kt") - public void testValid_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("valid.kt") - public void testValid_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt", "kotlin.coroutines"); + public void testValid() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/tailCalls/valid.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 66606008be0..3bdffdca101 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -934,10 +934,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -1033,43 +1029,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendFunctionAssertionDisabled.kt") - public void testSuspendFunctionAssertionDisabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunctionAssertionDisabled.kt") - public void testSuspendFunctionAssertionDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt"); } @TestMetadata("suspendFunctionAssertionsEnabled.kt") - public void testSuspendFunctionAssertionsEnabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunctionAssertionsEnabled.kt") - public void testSuspendFunctionAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt"); } @TestMetadata("suspendLambdaAssertionsDisabled.kt") - public void testSuspendLambdaAssertionsDisabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambdaAssertionsDisabled.kt") - public void testSuspendLambdaAssertionsDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt"); } @TestMetadata("suspendLambdaAssertionsEnabled.kt") - public void testSuspendLambdaAssertionsEnabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambdaAssertionsEnabled.kt") - public void testSuspendLambdaAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt"); } } } @@ -4865,10 +4841,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -4918,24 +4890,14 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines.experimental"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); - } - - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -5381,10 +5343,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -5430,13 +5388,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("kt39374.kt") - public void testKt39374_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -6570,42 +6523,28 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @TestMetadata("asyncException.kt") - public void testAsyncException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/asyncException.kt", "kotlin.coroutines.experimental"); + @TestMetadata("async.kt") + public void testAsync() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/async.kt"); } @TestMetadata("asyncException.kt") - public void testAsyncException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/asyncException.kt", "kotlin.coroutines"); + public void testAsyncException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/asyncException.kt"); } @TestMetadata("asyncIteratorNullMerge_1_3.kt") @@ -6623,44 +6562,19 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt"); } - @TestMetadata("async.kt") - public void testAsync_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/async.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("async.kt") - public void testAsync_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/async.kt", "kotlin.coroutines"); - } - @TestMetadata("await.kt") - public void testAwait_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines.experimental"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); } - @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -6684,53 +6598,28 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("coroutineToString.kt") @@ -6739,33 +6628,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines.experimental"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } - @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("defaultParametersInSuspendWithJvmOverloads.kt") @@ -6773,34 +6652,14 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); - } - @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -6809,13 +6668,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -6824,73 +6678,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("epam.kt") - public void testEpam_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("illegalState.kt") @@ -6899,183 +6718,93 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") - public void testInlineFunctionInMultifileClassUnoptimized_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") - public void testInlineFunctionInMultifileClassUnoptimized_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineFunctionInMultifileClass.kt") - public void testInlineFunctionInMultifileClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt", "kotlin.coroutines.experimental"); + public void testInlineFunctionInMultifileClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt"); } - @TestMetadata("inlineFunctionInMultifileClass.kt") - public void testInlineFunctionInMultifileClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt", "kotlin.coroutines"); + @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") + public void testInlineFunctionInMultifileClassUnoptimized() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -7104,43 +6833,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -7149,103 +6858,53 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines.experimental"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); } - @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -7253,44 +6912,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines.experimental"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); - } - - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("restrictedSuspendLambda.kt") @@ -7299,23 +6938,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines.experimental"); + public void testReturnByLabel() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); } - @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simple.kt"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -7324,33 +6958,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -7359,23 +6973,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendCovariantJavaOverrides.kt") @@ -7384,43 +6988,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -7434,43 +7018,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines.experimental"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); } - @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendJavaOverrides.kt") @@ -7484,13 +7048,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspendReturningPlatformType.kt") @@ -7498,24 +7057,14 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/suspendReturningPlatformType.kt"); } - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines.experimental"); + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); } @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -7524,73 +7073,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines.experimental"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); } - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -7601,42 +7115,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -7648,112 +7143,58 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -7762,113 +7203,58 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -7933,22 +7319,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -7957,23 +7334,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("delegate.kt") - public void testDelegate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("funInterface.kt") @@ -7982,13 +7349,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -8006,34 +7368,19 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines.experimental"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); - } - - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -8042,43 +7389,23 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines.experimental"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); } - @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -8089,22 +7416,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("fromJava.kt") @@ -8190,142 +7508,73 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -8355,10 +7604,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -8374,113 +7619,58 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8594,13 +7784,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8609,53 +7794,28 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8672,10 +7832,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -8691,113 +7847,58 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8911,13 +8012,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8926,53 +8022,28 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8989,10 +8060,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -9008,113 +8075,58 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -9213,13 +8225,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -9228,53 +8235,28 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -9292,32 +8274,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -9326,83 +8294,43 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -9414,92 +8342,48 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines.experimental"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); - } - - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines.experimental"); + public void testStartCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); } - @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -9511,62 +8395,33 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("objectWithSeveralSuspends.kt") - public void testObjectWithSeveralSuspends_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("objectWithSeveralSuspends.kt") - public void testObjectWithSeveralSuspends_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt", "kotlin.coroutines"); + public void testObjectWithSeveralSuspends() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt"); } @TestMetadata("returnLambda.kt") - public void testReturnLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnLambda.kt") - public void testReturnLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt", "kotlin.coroutines"); + public void testReturnLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt"); } @TestMetadata("returnObject.kt") - public void testReturnObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnObject.kt") - public void testReturnObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt", "kotlin.coroutines"); + public void testReturnObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt"); } @TestMetadata("severalCaptures.kt") - public void testSeveralCaptures_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("severalCaptures.kt") - public void testSeveralCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt", "kotlin.coroutines"); + public void testSeveralCaptures() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt"); } @TestMetadata("suspendInlineWithCrossinline.kt") - public void testSuspendInlineWithCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInlineWithCrossinline.kt") - public void testSuspendInlineWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt", "kotlin.coroutines"); + public void testSuspendInlineWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt"); } } @@ -9590,22 +8445,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } } @@ -9617,72 +8463,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("rec.kt") @@ -9690,44 +8502,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt"); } - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines.experimental"); + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); } @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -9740,82 +8532,43 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines.experimental"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); } - @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("inlineWithJava.kt") @@ -9824,13 +8577,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -9842,22 +8590,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -9897,72 +8636,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("exception.kt") - public void testException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines.experimental"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); } - @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -10007,32 +8712,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -10040,44 +8731,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines.experimental"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); - } - - @TestMetadata("inline.kt") - public void testInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("openFunWithJava.kt") @@ -10086,103 +8757,53 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("operators.kt") - public void testOperators_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines.experimental"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); } - @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -10194,62 +8815,33 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines.experimental"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); } - @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -10261,10 +8853,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -10275,13 +8863,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("crossinline.kt") - public void testCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithStateMachine.kt") @@ -10290,23 +8873,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("interfaceDelegation.kt") @@ -10339,21 +8912,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tailSuspendUnitFun.kt"); } + @TestMetadata("tryCatch.kt") + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + } + @TestMetadata("tryCatchTailCall.kt") public void testTryCatchTailCall() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatchTailCall.kt"); } - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); - } - @TestMetadata("unreachable.kt") public void testUnreachable() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); @@ -10441,52 +9009,28 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -10498,32 +9042,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -10537,33 +9067,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -10575,10 +9090,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -10589,33 +9100,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("kt19475.kt") - public void testKt19475_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -22162,10 +20658,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -22216,13 +20708,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } @TestMetadata("suspendFunction.kt") - public void testSuspendFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunction.kt") - public void testSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt", "kotlin.coroutines"); + public void testSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java index 34f6d2cebd4..560468424e3 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java @@ -3967,32 +3967,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -4001,33 +3987,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4036,33 +4007,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4071,73 +4027,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4146,33 +4067,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4186,43 +4092,23 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4281,22 +4167,13 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4304,24 +4181,14 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines.experimental"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); - } - - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4389,92 +4256,48 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4486,142 +4309,73 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines.experimental"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines.experimental"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines.experimental"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); } - @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4630,83 +4384,43 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } @TestMetadata("normalInline.kt") - public void testNormalInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines.experimental"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); } - @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java index 5897a7b6fbe..d396a68e870 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java @@ -674,52 +674,28 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("coroutineContextIntrinsic.kt") - public void testCoroutineContextIntrinsic_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContextIntrinsic.kt") - public void testCoroutineContextIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt", "kotlin.coroutines"); + public void testCoroutineContextIntrinsic() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt"); } @TestMetadata("coroutineFields.kt") - public void testCoroutineFields_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineFields.kt") - public void testCoroutineFields_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt", "kotlin.coroutines"); + public void testCoroutineFields() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt"); } @TestMetadata("oomInReturnUnit.kt") - public void testOomInReturnUnit_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("oomInReturnUnit.kt") - public void testOomInReturnUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt", "kotlin.coroutines"); + public void testOomInReturnUnit() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt"); } @TestMetadata("privateAccessor.kt") - public void testPrivateAccessor_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("privateAccessor.kt") - public void testPrivateAccessor_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt", "kotlin.coroutines"); + public void testPrivateAccessor() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt"); } @TestMetadata("privateSuspendFun.kt") @@ -733,23 +709,13 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { } @TestMetadata("suspendReifiedFun.kt") - public void testSuspendReifiedFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendReifiedFun.kt") - public void testSuspendReifiedFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt", "kotlin.coroutines"); + public void testSuspendReifiedFun() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt"); } @TestMetadata("tcoContinuation.kt") - public void testTcoContinuation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tcoContinuation.kt") - public void testTcoContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt", "kotlin.coroutines"); + public void testTcoContinuation() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt"); } @TestMetadata("compiler/testData/codegen/bytecodeListing/coroutines/spilling") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java index cd167f36637..59439ce3d61 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java @@ -1403,10 +1403,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -1437,13 +1433,8 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { } @TestMetadata("returnUnitInLambda.kt") - public void testReturnUnitInLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnUnitInLambda.kt") - public void testReturnUnitInLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt", "kotlin.coroutines"); + public void testReturnUnitInLambda() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt"); } @TestMetadata("suspendMain.kt") @@ -1621,112 +1612,58 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java index e3d11df63c5..bd4dcd72c7e 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3967,32 +3967,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -4001,33 +3987,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4036,33 +4007,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4071,73 +4027,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4146,33 +4067,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4186,43 +4092,23 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4281,22 +4167,13 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4304,24 +4181,14 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines.experimental"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); - } - - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4389,92 +4256,48 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4486,142 +4309,73 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines.experimental"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines.experimental"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines.experimental"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); } - @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4630,83 +4384,43 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } @TestMetadata("normalInline.kt") - public void testNormalInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines.experimental"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); } - @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java index 131fa5a6431..768154b00c0 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,10 +24,6 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.ANY, testDataFilePath); - } - public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, true); } @@ -99,13 +94,8 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl } @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt", "kotlin.coroutines"); + public void testCoroutinesBinary() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); } @TestMetadata("defaultConstructor.kt") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index b589166eb2b..488e065ea32 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -949,10 +949,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -1033,43 +1029,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendFunctionAssertionDisabled.kt") - public void testSuspendFunctionAssertionDisabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunctionAssertionDisabled.kt") - public void testSuspendFunctionAssertionDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt"); } @TestMetadata("suspendFunctionAssertionsEnabled.kt") - public void testSuspendFunctionAssertionsEnabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunctionAssertionsEnabled.kt") - public void testSuspendFunctionAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt"); } @TestMetadata("suspendLambdaAssertionsDisabled.kt") - public void testSuspendLambdaAssertionsDisabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambdaAssertionsDisabled.kt") - public void testSuspendLambdaAssertionsDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt"); } @TestMetadata("suspendLambdaAssertionsEnabled.kt") - public void testSuspendLambdaAssertionsEnabled_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambdaAssertionsEnabled.kt") - public void testSuspendLambdaAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt"); } } } @@ -4865,10 +4841,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -4918,24 +4890,14 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines.experimental"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); - } - - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -5381,10 +5343,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -5430,13 +5388,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("kt39374.kt") - public void testKt39374_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -6570,42 +6523,28 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @TestMetadata("asyncException.kt") - public void testAsyncException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/asyncException.kt", "kotlin.coroutines.experimental"); + @TestMetadata("async.kt") + public void testAsync() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/async.kt"); } @TestMetadata("asyncException.kt") - public void testAsyncException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/asyncException.kt", "kotlin.coroutines"); + public void testAsyncException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/asyncException.kt"); } @TestMetadata("asyncIteratorNullMerge_1_3.kt") @@ -6623,44 +6562,19 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt"); } - @TestMetadata("async.kt") - public void testAsync_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/async.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("async.kt") - public void testAsync_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/async.kt", "kotlin.coroutines"); - } - @TestMetadata("await.kt") - public void testAwait_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines.experimental"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); } - @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -6684,53 +6598,28 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("coroutineToString.kt") @@ -6739,33 +6628,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines.experimental"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } - @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("defaultParametersInSuspendWithJvmOverloads.kt") @@ -6773,34 +6652,14 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); - } - @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -6809,13 +6668,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -6824,73 +6678,38 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("epam.kt") - public void testEpam_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("illegalState.kt") @@ -6899,183 +6718,93 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") - public void testInlineFunctionInMultifileClassUnoptimized_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") - public void testInlineFunctionInMultifileClassUnoptimized_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineFunctionInMultifileClass.kt") - public void testInlineFunctionInMultifileClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt", "kotlin.coroutines.experimental"); + public void testInlineFunctionInMultifileClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt"); } - @TestMetadata("inlineFunctionInMultifileClass.kt") - public void testInlineFunctionInMultifileClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt", "kotlin.coroutines"); + @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") + public void testInlineFunctionInMultifileClassUnoptimized() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -7104,43 +6833,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -7149,103 +6858,53 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines.experimental"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); } - @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -7253,44 +6912,24 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines.experimental"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); - } - - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("restrictedSuspendLambda.kt") @@ -7299,23 +6938,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines.experimental"); + public void testReturnByLabel() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/returnByLabel.kt"); } - @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simple.kt"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -7324,33 +6958,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -7359,23 +6973,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendCovariantJavaOverrides.kt") @@ -7384,43 +6988,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -7434,43 +7018,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines.experimental"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); } - @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendJavaOverrides.kt") @@ -7484,13 +7048,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspendReturningPlatformType.kt") @@ -7498,24 +7057,14 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/suspendReturningPlatformType.kt"); } - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines.experimental"); + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); } @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -7524,73 +7073,38 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines.experimental"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); } - @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -7601,42 +7115,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -7648,112 +7143,58 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -7762,113 +7203,58 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -7938,22 +7324,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -7962,33 +7339,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("delegate.kt") - public void testDelegate_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -8006,34 +7368,19 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines.experimental"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); - } - - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -8042,43 +7389,23 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines.experimental"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); } - @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -8089,22 +7416,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("fromJava.kt") @@ -8190,142 +7508,73 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -8355,10 +7604,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -8374,113 +7619,58 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8594,13 +7784,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8609,53 +7794,28 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8672,10 +7832,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -8691,113 +7847,58 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8911,13 +8012,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8926,53 +8022,28 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8989,10 +8060,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -9008,113 +8075,58 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -9213,13 +8225,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -9228,53 +8235,28 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -9292,32 +8274,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -9326,83 +8294,43 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -9414,92 +8342,48 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines.experimental"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); - } - - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines.experimental"); + public void testStartCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt"); } - @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + @TestMetadata("startCoroutineUninterceptedOrReturn.kt") + public void testStartCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt"); + } + + @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -9511,62 +8395,33 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("objectWithSeveralSuspends.kt") - public void testObjectWithSeveralSuspends_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("objectWithSeveralSuspends.kt") - public void testObjectWithSeveralSuspends_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt", "kotlin.coroutines"); + public void testObjectWithSeveralSuspends() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt"); } @TestMetadata("returnLambda.kt") - public void testReturnLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnLambda.kt") - public void testReturnLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt", "kotlin.coroutines"); + public void testReturnLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt"); } @TestMetadata("returnObject.kt") - public void testReturnObject_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnObject.kt") - public void testReturnObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt", "kotlin.coroutines"); + public void testReturnObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt"); } @TestMetadata("severalCaptures.kt") - public void testSeveralCaptures_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("severalCaptures.kt") - public void testSeveralCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt", "kotlin.coroutines"); + public void testSeveralCaptures() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt"); } @TestMetadata("suspendInlineWithCrossinline.kt") - public void testSuspendInlineWithCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInlineWithCrossinline.kt") - public void testSuspendInlineWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt", "kotlin.coroutines"); + public void testSuspendInlineWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt"); } } @@ -9587,23 +8442,14 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @RunWith(JUnit3RunnerWithInners.class) public static class Anonymous extends AbstractLightAnalysisModeTest { @TestMetadata("simple.kt") - public void ignoreSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void ignoreSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void ignoreSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -9617,72 +8463,38 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("rec.kt") @@ -9690,44 +8502,24 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt"); } - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines.experimental"); + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); } @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -9740,82 +8532,43 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines.experimental"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); } - @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("inlineWithJava.kt") @@ -9824,13 +8577,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -9842,22 +8590,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -9897,72 +8636,38 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("exception.kt") - public void testException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines.experimental"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); } - @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -10007,32 +8712,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -10040,44 +8731,24 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines.experimental"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); - } - - @TestMetadata("inline.kt") - public void testInline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("openFunWithJava.kt") @@ -10086,103 +8757,53 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("operators.kt") - public void testOperators_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines.experimental"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); } - @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -10194,62 +8815,33 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines.experimental"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); } - @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -10261,10 +8853,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -10275,13 +8863,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("crossinline.kt") - public void testCrossinline_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithStateMachine.kt") @@ -10290,23 +8873,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("interfaceDelegation.kt") @@ -10339,21 +8912,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tailSuspendUnitFun.kt"); } + @TestMetadata("tryCatch.kt") + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + } + @TestMetadata("tryCatchTailCall.kt") public void testTryCatchTailCall() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatchTailCall.kt"); } - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); - } - @TestMetadata("unreachable.kt") public void testUnreachable() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); @@ -10441,52 +9009,28 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -10498,32 +9042,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -10537,33 +9067,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -10575,10 +9090,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -10589,33 +9100,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("kt19475.kt") - public void testKt19475_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -22162,10 +20658,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM, testDataFilePath); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } @@ -22216,13 +20708,8 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } @TestMetadata("suspendFunction.kt") - public void testSuspendFunction_1_2() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt", "kotlin.coroutines.experimental"); - } - - @TestMetadata("suspendFunction.kt") - public void testSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt", "kotlin.coroutines"); + public void testSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 5ccaafe90ca..f0f0882d326 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -934,10 +934,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -1033,23 +1029,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendFunctionAssertionDisabled.kt") - public void testSuspendFunctionAssertionDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionDisabled.kt"); } @TestMetadata("suspendFunctionAssertionsEnabled.kt") - public void testSuspendFunctionAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendFunctionAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendFunctionAssertionsEnabled.kt"); } @TestMetadata("suspendLambdaAssertionsDisabled.kt") - public void testSuspendLambdaAssertionsDisabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsDisabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsDisabled.kt"); } @TestMetadata("suspendLambdaAssertionsEnabled.kt") - public void testSuspendLambdaAssertionsEnabled_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt", "kotlin.coroutines"); + public void testSuspendLambdaAssertionsEnabled() throws Exception { + runTest("compiler/testData/codegen/box/assert/jvm/suspendLambdaAssertionsEnabled.kt"); } } } @@ -4845,10 +4841,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -4898,14 +4890,14 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutinesNoStdLib.kt") + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -5351,10 +5343,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -5400,8 +5388,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -6535,27 +6523,28 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } + @TestMetadata("async.kt") + public void testAsync() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/async.kt"); + } + @TestMetadata("asyncException.kt") - public void testAsyncException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/asyncException.kt", "kotlin.coroutines"); + public void testAsyncException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/asyncException.kt"); } @TestMetadata("asyncIteratorNullMerge_1_3.kt") @@ -6573,24 +6562,19 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/asyncIterator_1_3.kt"); } - @TestMetadata("async.kt") - public void testAsync_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/async.kt", "kotlin.coroutines"); - } - @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -6614,28 +6598,28 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("coroutineToString.kt") @@ -6644,18 +6628,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); + } + + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("defaultParametersInSuspendWithJvmOverloads.kt") @@ -6663,19 +6652,14 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); - } - @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -6684,8 +6668,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -6694,38 +6678,38 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("illegalState.kt") @@ -6734,93 +6718,93 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") - public void testInlineFunctionInMultifileClassUnoptimized_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineFunctionInMultifileClass.kt") - public void testInlineFunctionInMultifileClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt", "kotlin.coroutines"); + public void testInlineFunctionInMultifileClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClass.kt"); + } + + @TestMetadata("inlineFunctionInMultifileClassUnoptimized.kt") + public void testInlineFunctionInMultifileClassUnoptimized() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunctionInMultifileClassUnoptimized.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -6849,23 +6833,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -6874,53 +6858,53 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -6928,24 +6912,24 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("restrictedSuspendLambda.kt") @@ -6954,13 +6938,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + 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"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -6969,18 +6958,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -6989,13 +6973,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendCovariantJavaOverrides.kt") @@ -7004,23 +6988,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -7034,23 +7018,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendJavaOverrides.kt") @@ -7064,8 +7048,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspendReturningPlatformType.kt") @@ -7073,14 +7057,14 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/suspendReturningPlatformType.kt"); } - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); + @TestMetadata("suspensionInsideSafeCall.kt") + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); } - @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -7089,38 +7073,38 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -7131,27 +7115,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -7163,62 +7143,58 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -7227,58 +7203,58 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -7343,17 +7319,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -7362,13 +7334,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("funInterface.kt") @@ -7377,8 +7349,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -7396,19 +7368,19 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -7417,23 +7389,23 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -7444,17 +7416,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("fromJava.kt") @@ -7540,77 +7508,73 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -7640,10 +7604,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -7659,58 +7619,58 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -7824,8 +7784,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -7834,28 +7794,28 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -7872,10 +7832,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -7891,58 +7847,58 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8056,8 +8012,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8066,28 +8022,28 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8104,10 +8060,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -8123,58 +8075,58 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -8273,8 +8225,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -8283,28 +8235,28 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -8322,22 +8274,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -8346,43 +8294,43 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -8394,52 +8342,48 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + 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("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -8451,37 +8395,33 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("objectWithSeveralSuspends.kt") - public void testObjectWithSeveralSuspends_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt", "kotlin.coroutines"); + public void testObjectWithSeveralSuspends() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/objectWithSeveralSuspends.kt"); } @TestMetadata("returnLambda.kt") - public void testReturnLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt", "kotlin.coroutines"); + public void testReturnLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt"); } @TestMetadata("returnObject.kt") - public void testReturnObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt", "kotlin.coroutines"); + public void testReturnObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/returnObject.kt"); } @TestMetadata("severalCaptures.kt") - public void testSeveralCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt", "kotlin.coroutines"); + public void testSeveralCaptures() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/severalCaptures.kt"); } @TestMetadata("suspendInlineWithCrossinline.kt") - public void testSuspendInlineWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt", "kotlin.coroutines"); + public void testSuspendInlineWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt"); } } @@ -8505,17 +8445,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } } @@ -8527,42 +8463,38 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("rec.kt") @@ -8570,24 +8502,24 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/rec.kt"); } - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); } - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -8600,47 +8532,43 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("inlineWithJava.kt") @@ -8649,8 +8577,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -8662,17 +8590,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -8712,42 +8636,38 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); + } + + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -8792,22 +8712,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -8815,24 +8731,24 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("openFunWithJava.kt") @@ -8841,53 +8757,53 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -8899,37 +8815,33 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + } + + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -8941,10 +8853,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -8955,8 +8863,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithStateMachine.kt") @@ -8965,13 +8873,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("interfaceDelegation.kt") @@ -9004,16 +8912,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tailSuspendUnitFun.kt"); } + @TestMetadata("tryCatch.kt") + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); + } + @TestMetadata("tryCatchTailCall.kt") public void testTryCatchTailCall() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatchTailCall.kt"); } - @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); - } - @TestMetadata("unreachable.kt") public void testUnreachable() throws Exception { runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unreachable.kt"); @@ -9101,32 +9009,28 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -9138,22 +9042,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -9167,18 +9067,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -9190,10 +9090,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -9204,18 +9100,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -20396,10 +20292,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -20450,8 +20342,8 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } @TestMetadata("suspendFunction.kt") - public void testSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt", "kotlin.coroutines"); + public void testSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/parametersMetadata/suspendFunction.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java index 339372300a6..72ae58bb07a 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java @@ -3967,22 +3967,18 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -3991,18 +3987,18 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4011,18 +4007,18 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4031,38 +4027,38 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4071,18 +4067,18 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4096,23 +4092,23 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4171,17 +4167,13 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4189,14 +4181,14 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4264,52 +4256,48 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4321,77 +4309,73 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4400,43 +4384,43 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java index 139e31166d6..55440bc1093 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java @@ -674,32 +674,28 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("coroutineContextIntrinsic.kt") - public void testCoroutineContextIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt", "kotlin.coroutines"); + public void testCoroutineContextIntrinsic() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.kt"); } @TestMetadata("coroutineFields.kt") - public void testCoroutineFields_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt", "kotlin.coroutines"); + public void testCoroutineFields() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.kt"); } @TestMetadata("oomInReturnUnit.kt") - public void testOomInReturnUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt", "kotlin.coroutines"); + public void testOomInReturnUnit() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.kt"); } @TestMetadata("privateAccessor.kt") - public void testPrivateAccessor_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt", "kotlin.coroutines"); + public void testPrivateAccessor() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.kt"); } @TestMetadata("privateSuspendFun.kt") @@ -713,13 +709,13 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes } @TestMetadata("suspendReifiedFun.kt") - public void testSuspendReifiedFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt", "kotlin.coroutines"); + public void testSuspendReifiedFun() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.kt"); } @TestMetadata("tcoContinuation.kt") - public void testTcoContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt", "kotlin.coroutines"); + public void testTcoContinuation() throws Exception { + runTest("compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.kt"); } @TestMetadata("compiler/testData/codegen/bytecodeListing/coroutines/spilling") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java index e7e3faff259..b68ce967cf4 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java @@ -1413,10 +1413,6 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInCoroutines() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/coroutines"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -1447,8 +1443,8 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { } @TestMetadata("returnUnitInLambda.kt") - public void testReturnUnitInLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt", "kotlin.coroutines"); + public void testReturnUnitInLambda() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/returnUnitInLambda.kt"); } @TestMetadata("suspendMain.kt") @@ -1626,62 +1622,58 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInArrayStore.kt") - public void testUsedInArrayStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt", "kotlin.coroutines"); + public void testUsedInArrayStore() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInArrayStore.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInPutfield.kt") - public void testUsedInPutfield_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt", "kotlin.coroutines"); + public void testUsedInPutfield() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInPutfield.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java index bff2ed9cbd6..0020e5583d8 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3967,22 +3967,18 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -3991,18 +3987,18 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4011,18 +4007,18 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4031,38 +4027,38 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4071,18 +4067,18 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4096,23 +4092,23 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4171,17 +4167,13 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4189,14 +4181,14 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4264,52 +4256,48 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4321,77 +4309,73 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4400,43 +4384,43 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java index 6f3c23ba64a..661e383ed48 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java @@ -25,10 +25,6 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_IR, testDataFilePath); - } - public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @@ -99,8 +95,8 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile } @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt", "kotlin.coroutines"); + public void testCoroutinesBinary() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); } @TestMetadata("defaultConstructor.kt") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java index 667670a5fff..80f53c21a77 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java @@ -3967,22 +3967,18 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -3991,18 +3987,18 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4011,18 +4007,18 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4031,38 +4027,38 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4071,18 +4067,18 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4096,23 +4092,23 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4171,17 +4167,13 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4189,14 +4181,14 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4264,52 +4256,48 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4321,77 +4309,73 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4400,43 +4384,43 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java index 1a5dd9b4c01..2bf647867d7 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java @@ -25,10 +25,6 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath); - } - public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true); } @@ -99,8 +95,8 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT } @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt", "kotlin.coroutines"); + public void testCoroutinesBinary() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); } @TestMetadata("defaultConstructor.kt") diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java index 36a35e81b21..6adf46a8b9e 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java @@ -3967,22 +3967,18 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("debugMetadataCrossinline.kt") @@ -3991,18 +3987,18 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("enclodingMethod.kt") - public void testEnclodingMethod_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt", "kotlin.coroutines"); + public void testEnclodingMethod() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/enclodingMethod.kt"); } @TestMetadata("fileNameInMetadata.kt") @@ -4011,18 +4007,18 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendContinuation.kt") - public void testInlineSuspendContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt", "kotlin.coroutines"); + public void testInlineSuspendContinuation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendContinuation.kt"); } @TestMetadata("inlineSuspendInMultifileClass.kt") @@ -4031,38 +4027,38 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("jvmName.kt") - public void testJvmName_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/jvmName.kt", "kotlin.coroutines"); + public void testJvmName() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/jvmName.kt"); } @TestMetadata("kt26658.kt") @@ -4071,18 +4067,18 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nestedMethodWith2XParameter.kt") @@ -4096,23 +4092,23 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -4171,17 +4167,13 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -4189,14 +4181,14 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -4264,52 +4256,48 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -4321,77 +4309,73 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath, "// IGNORE_BACKEND_MULTI_MODULE: "); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -4400,43 +4384,43 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java index a152a8fc6b2..b9e522e054a 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java @@ -25,10 +25,6 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath); - } - public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true); } @@ -99,8 +95,8 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT } @TestMetadata("coroutinesBinary.kt") - public void testCoroutinesBinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt", "kotlin.coroutines"); + public void testCoroutinesBinary() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/coroutinesBinary.kt"); } @TestMetadata("defaultConstructor.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index 27a52900e5b..69e9121d2b7 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -509,8 +509,7 @@ fun main(args: Array) { testClass { model( "compileKotlinAgainstKotlin", - targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, - skipTestsForExperimentalCoroutines = true + targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR ) } @@ -634,8 +633,7 @@ fun main(args: Array) { testClass { model( "codegen/boxInline", - targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, - skipTestsForExperimentalCoroutines = true + targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR ) } } @@ -713,8 +711,7 @@ fun main(args: Array) { testClass { model( "diagnostics/testsWithStdLib", - excludedPattern = excludedFirTestdataPattern, - skipTestsForExperimentalCoroutines = true + excludedPattern = excludedFirTestdataPattern ) } } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/RunTestMethodWithPackageReplacementModel.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/RunTestMethodWithPackageReplacementModel.kt deleted file mode 100644 index ae7da1cc1f3..00000000000 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/RunTestMethodWithPackageReplacementModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * 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 - -import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.utils.Printer - -class RunTestMethodWithPackageReplacementModel( - private val targetBackend: TargetBackend, - private val testMethodName: String, - private val testRunnerMethodName: String, - private val additionalRunnerArguments: List -) : MethodModel { - override val name = METHOD_NAME - override val dataString: String? = null - - override fun generateSignature(p: Printer) { - p.print("private void $name(String testDataFilePath, String packageName) throws Exception") - } - - override fun generateBody(p: Printer) { - val className = TargetBackend::class.java.simpleName - val additionalArguments = if (additionalRunnerArguments.isNotEmpty()) - additionalRunnerArguments.joinToString(separator = ", ", prefix = ", ") - else "" - p.println("KotlinTestUtils.$testRunnerMethodName(filePath -> $testMethodName(filePath, packageName), $className.$targetBackend, testDataFilePath$additionalArguments);") - } - - override fun imports(): Collection> { - return super.imports() + setOf(TargetBackend::class.java) - } - - companion object { - const val METHOD_NAME = "runTestWithPackageReplacement" - } -} \ No newline at end of file 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 c2bdff95e45..dbe9a2f1700 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 @@ -9,7 +9,6 @@ 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; @@ -17,7 +16,6 @@ import org.jetbrains.kotlin.utils.Printer; import java.io.File; import java.util.*; import java.util.regex.Pattern; -import java.util.stream.Collectors; public class SimpleTestClassModel extends TestClassModel { private static final Comparator BY_NAME = Comparator.comparing(TestEntityModel::getName); @@ -53,8 +51,6 @@ public class SimpleTestClassModel extends TestClassModel { private final String testRunnerMethodName; private final List additionalRunnerArguments; - private boolean skipTestsForExperimentalCoroutines; - public SimpleTestClassModel( @NotNull File rootFile, boolean recursive, @@ -70,8 +66,7 @@ public class SimpleTestClassModel extends TestClassModel { String testRunnerMethodName, List additionalRunnerArguments, Integer deep, - @NotNull Collection annotations, - boolean skipTestsForExperimentalCoroutines + @NotNull Collection annotations ) { this.rootFile = rootFile; this.recursive = recursive; @@ -88,7 +83,6 @@ public class SimpleTestClassModel extends TestClassModel { this.additionalRunnerArguments = additionalRunnerArguments; this.deep = deep; this.annotations = annotations; - this.skipTestsForExperimentalCoroutines = skipTestsForExperimentalCoroutines; } @NotNull @@ -108,8 +102,8 @@ public class SimpleTestClassModel extends TestClassModel { children.add(new SimpleTestClassModel( file, true, excludeParentDirs, filenamePattern, excludePattern, checkFilenameStartsLowerCase, doTestMethodName, innerTestClassName, targetBackend, excludesStripOneDirectory(file.getName()), - skipIgnored, testRunnerMethodName, additionalRunnerArguments, deep != null ? deep - 1 : null, annotations, - skipTestsForExperimentalCoroutines) + skipIgnored, testRunnerMethodName, additionalRunnerArguments, deep != null ? deep - 1 : null, annotations + ) ); } @@ -158,16 +152,9 @@ public class SimpleTestClassModel extends TestClassModel { public Collection getMethods() { if (testMethods == null) { if (!rootFile.isDirectory()) { - if (CoroutinesKt.isCommonCoroutineTest(rootFile)) { - testMethods = CoroutinesKt.createCommonCoroutinesTestMethodModels(rootFile, rootFile, filenamePattern, - checkFilenameStartsLowerCase, targetBackend, - skipIgnored, skipTestsForExperimentalCoroutines); - } - else { - testMethods = Collections.singletonList(new SimpleTestMethodModel( - rootFile, rootFile, filenamePattern, checkFilenameStartsLowerCase, targetBackend, skipIgnored - )); - } + testMethods = Collections.singletonList(new SimpleTestMethodModel( + rootFile, rootFile, filenamePattern, checkFilenameStartsLowerCase, targetBackend, skipIgnored + )); } else { List result = new ArrayList<>(); @@ -178,8 +165,6 @@ public class SimpleTestClassModel extends TestClassModel { File[] listFiles = rootFile.listFiles(); - boolean hasCoroutines = false; - if (listFiles != null && (deep == null || deep == 0)) { for (File file : listFiles) { boolean excluded = excludePattern != null && excludePattern.matcher(file.getName()).matches(); @@ -188,28 +173,11 @@ public class SimpleTestClassModel extends TestClassModel { if (file.isDirectory() && excludeParentDirs && dirHasSubDirs(file)) { continue; } - - if (!file.isDirectory() && CoroutinesKt.isCommonCoroutineTest(file)) { - hasCoroutines = true; - result.addAll(CoroutinesKt.createCommonCoroutinesTestMethodModels(rootFile, file, - filenamePattern, - checkFilenameStartsLowerCase, - targetBackend, skipIgnored, - skipTestsForExperimentalCoroutines)); - } - else { - result.add(new SimpleTestMethodModel(rootFile, file, filenamePattern, - checkFilenameStartsLowerCase, targetBackend, skipIgnored)); - } + result.add(new SimpleTestMethodModel(rootFile, file, filenamePattern, checkFilenameStartsLowerCase, targetBackend, skipIgnored)); } } } - if (hasCoroutines) { - String methodName = doTestMethodName + "WithCoroutinesPackageReplacement"; - result.add(new RunTestMethodWithPackageReplacementModel(targetBackend, methodName, testRunnerMethodName, additionalRunnerArguments)); - } - result.sort(BY_NAME); testMethods = result; diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt index f9ca7941677..e0d31bd80a6 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/tests/generator/TestGenerationDSL.kt @@ -66,8 +66,7 @@ class TestGroup( excludeDirs: List = listOf(), filenameStartsLowerCase: Boolean? = null, skipIgnored: Boolean = false, - deep: Int? = null, - skipTestsForExperimentalCoroutines: Boolean = false + deep: Int? = null ) { val rootFile = File("$testDataRoot/$relativeRootPath") val compiledPattern = Pattern.compile(pattern) @@ -84,8 +83,7 @@ class TestGroup( SimpleTestClassModel( rootFile, recursive, excludeParentDirs, compiledPattern, compiledExcludedPattern, filenameStartsLowerCase, testMethod, className, - targetBackend, excludeDirs, skipIgnored, testRunnerMethodName, additionalRunnerArguments, deep, annotations, - skipTestsForExperimentalCoroutines + targetBackend, excludeDirs, skipIgnored, testRunnerMethodName, additionalRunnerArguments, deep, annotations ) } ) 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 deleted file mode 100644 index 6f526277d52..00000000000 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/coroutines.kt +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * 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.RunTestMethodWithPackageReplacementModel -import org.jetbrains.kotlin.generators.tests.generator.SimpleTestMethodModel -import org.jetbrains.kotlin.test.InTextDirectivesUtils -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, - 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 "" - val packageName = if (isLanguageVersion1_3) "kotlin.coroutines" else "kotlin.coroutines.experimental" - - p.println(RunTestMethodWithPackageReplacementModel.METHOD_NAME, "(\"$filePath\", \"$packageName\");") - } -} - -fun isCommonCoroutineTest(file: File): Boolean { - return InTextDirectivesUtils.isDirectiveDefined(file.readText(), "COMMON_COROUTINES_TEST") -} - -fun createCommonCoroutinesTestMethodModels( - rootDir: File, - file: File, - filenamePattern: Pattern, - checkFilenameStartsLowerCase: Boolean?, - targetBackend: TargetBackend, - skipIgnored: Boolean, - skipExperimental: Boolean -): Collection { - return if (targetBackend.isIR || targetBackend == TargetBackend.JS) - listOf( - CoroutinesTestModel( - rootDir, - file, - filenamePattern, - checkFilenameStartsLowerCase, - targetBackend, - skipIgnored, - true - ) - ) - else { - mutableListOf( - CoroutinesTestModel( - rootDir, - file, - filenamePattern, - checkFilenameStartsLowerCase, - targetBackend, - skipIgnored, - true - ) - ).apply { - if (!skipExperimental) { - this += CoroutinesTestModel( - rootDir, - file, - filenamePattern, - checkFilenameStartsLowerCase, - targetBackend, - skipIgnored, - false - ) - - } - } - } -} \ No newline at end of file diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java index e2d8f4db811..16c667b847c 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java @@ -699,10 +699,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -3980,10 +3976,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -4033,14 +4025,14 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutinesNoStdLib.kt") + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -4241,10 +4233,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -4290,8 +4278,8 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -5400,18 +5388,14 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { @@ -5434,18 +5418,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -5469,58 +5453,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -5529,8 +5513,8 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -5539,118 +5523,118 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -5679,23 +5663,23 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -5704,53 +5688,53 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -5758,34 +5742,39 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + 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"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -5794,18 +5783,13 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -5814,33 +5798,33 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -5849,23 +5833,23 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendLambdaInInterface.kt") @@ -5874,18 +5858,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + } + + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -5894,38 +5878,38 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -5936,27 +5920,23 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -5968,62 +5948,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -6032,58 +6008,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -6108,17 +6084,13 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -6127,18 +6099,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -6156,19 +6128,19 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -6177,23 +6149,23 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -6204,17 +6176,13 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("longArgs.kt") @@ -6285,77 +6253,73 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -6385,10 +6349,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -6404,58 +6364,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -6569,8 +6529,8 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -6579,28 +6539,28 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -6617,10 +6577,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -6636,58 +6592,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -6801,8 +6757,8 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -6811,28 +6767,28 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -6849,10 +6805,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -6868,58 +6820,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -7018,8 +6970,8 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -7028,28 +6980,28 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -7067,22 +7019,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -7091,33 +7039,33 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -7129,52 +7077,48 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + 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("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -7186,10 +7130,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -7215,17 +7155,13 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } } @@ -7237,62 +7173,58 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); - } - - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + } + + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -7305,52 +7237,48 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -7362,17 +7290,13 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -7397,42 +7321,38 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); + } + + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -7477,22 +7397,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -7500,74 +7416,74 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -7579,37 +7495,33 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + } + + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -7621,32 +7533,28 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit") @@ -7671,32 +7579,28 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -7708,22 +7612,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -7737,18 +7637,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -7760,10 +7660,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @@ -7774,18 +7670,18 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes } @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -16737,10 +16633,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java index b758b1ee66b..66dbe5bc502 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java @@ -3557,72 +3557,68 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("kt26658.kt") @@ -3631,18 +3627,18 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -3651,23 +3647,23 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -3726,17 +3722,13 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -3744,14 +3736,14 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -3809,52 +3801,48 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -3866,77 +3854,73 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR_ES6, testDataFilePath); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -3945,43 +3929,43 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 010e8fcf14c..50ce36ce3e7 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -699,10 +699,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -3980,10 +3976,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -4033,14 +4025,14 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutinesNoStdLib.kt") + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -4241,10 +4233,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -4290,8 +4278,8 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -5400,18 +5388,14 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { @@ -5434,18 +5418,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -5469,58 +5453,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -5529,8 +5513,8 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -5539,118 +5523,118 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -5679,23 +5663,23 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -5704,53 +5688,53 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -5758,34 +5742,39 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + 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"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -5794,18 +5783,13 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -5814,33 +5798,33 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -5849,23 +5833,23 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendLambdaInInterface.kt") @@ -5874,18 +5858,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + } + + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -5894,38 +5878,38 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -5936,27 +5920,23 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -5968,62 +5948,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -6032,58 +6008,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -6108,17 +6084,13 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -6127,18 +6099,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -6156,19 +6128,19 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -6177,23 +6149,23 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -6204,17 +6176,13 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("longArgs.kt") @@ -6285,77 +6253,73 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -6385,10 +6349,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -6404,58 +6364,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -6569,8 +6529,8 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -6579,28 +6539,28 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -6617,10 +6577,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -6636,58 +6592,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -6801,8 +6757,8 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -6811,28 +6767,28 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -6849,10 +6805,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -6868,58 +6820,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -7018,8 +6970,8 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -7028,28 +6980,28 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -7067,22 +7019,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -7091,33 +7039,33 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -7129,52 +7077,48 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + 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("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -7186,10 +7130,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -7215,17 +7155,13 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } } @@ -7237,62 +7173,58 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); - } - - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + } + + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -7305,52 +7237,48 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -7362,17 +7290,13 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -7397,42 +7321,38 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); + } + + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -7477,22 +7397,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -7500,74 +7416,74 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -7579,37 +7495,33 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + } + + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -7621,32 +7533,28 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit") @@ -7671,32 +7579,28 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -7708,22 +7612,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -7737,18 +7637,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -7760,10 +7660,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @@ -7774,18 +7670,18 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -16737,10 +16633,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java index 23d718edc84..e4fc9475d11 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java @@ -3557,72 +3557,68 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("kt26658.kt") @@ -3631,18 +3627,18 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -3651,23 +3647,23 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -3726,17 +3722,13 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -3744,14 +3736,14 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -3809,52 +3801,48 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -3866,77 +3854,73 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS_IR, testDataFilePath); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -3945,43 +3929,43 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 6236c45be81..eb23ac83c59 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -699,10 +699,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -3980,10 +3976,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -4033,14 +4025,14 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt"); } - @TestMetadata("withCoroutinesNoStdLib.kt") - public void testWithCoroutinesNoStdLib_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutines.kt") + public void testWithCoroutines() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt"); } - @TestMetadata("withCoroutines.kt") - public void testWithCoroutines_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutines.kt", "kotlin.coroutines"); + @TestMetadata("withCoroutinesNoStdLib.kt") + public void testWithCoroutinesNoStdLib() throws Exception { + runTest("compiler/testData/codegen/box/closures/capturedVarsOptimization/withCoroutinesNoStdLib.kt"); } } @@ -4241,10 +4233,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInContracts() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/contracts"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -4290,8 +4278,8 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("kt39374.kt") - public void testKt39374_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/contracts/kt39374.kt", "kotlin.coroutines"); + public void testKt39374() throws Exception { + runTest("compiler/testData/codegen/box/contracts/kt39374.kt"); } @TestMetadata("lambdaParameter.kt") @@ -5400,18 +5388,14 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - @TestMetadata("32defaultParametersInSuspend.kt") - public void test32defaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void test32defaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/32defaultParametersInSuspend.kt"); } @TestMetadata("accessorForSuspend.kt") - public void testAccessorForSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt", "kotlin.coroutines"); + public void testAccessorForSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/accessorForSuspend.kt"); } public void testAllFilesPresentInCoroutines() throws Exception { @@ -5434,18 +5418,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("await.kt") - public void testAwait_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/await.kt", "kotlin.coroutines"); - } - - @TestMetadata("beginWithExceptionNoHandleException.kt") - public void testBeginWithExceptionNoHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt", "kotlin.coroutines"); + public void testAwait() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/await.kt"); } @TestMetadata("beginWithException.kt") - public void testBeginWithException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines"); + public void testBeginWithException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithException.kt"); + } + + @TestMetadata("beginWithExceptionNoHandleException.kt") + public void testBeginWithExceptionNoHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/beginWithExceptionNoHandleException.kt"); } @TestMetadata("builderInferenceAndGenericArrayAcessCall.kt") @@ -5469,58 +5453,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("capturedVarInSuspendLambda.kt") - public void testCapturedVarInSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines"); + public void testCapturedVarInSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt"); } @TestMetadata("catchWithInlineInsideSuspend.kt") - public void testCatchWithInlineInsideSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines"); + public void testCatchWithInlineInsideSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt"); } @TestMetadata("coercionToUnit.kt") - public void testCoercionToUnit_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines"); + public void testCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coercionToUnit.kt"); } @TestMetadata("controllerAccessFromInnerLambda.kt") - public void testControllerAccessFromInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt", "kotlin.coroutines"); + public void testControllerAccessFromInnerLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controllerAccessFromInnerLambda.kt"); } @TestMetadata("coroutineContextInInlinedLambda.kt") - public void testCoroutineContextInInlinedLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt", "kotlin.coroutines"); + public void testCoroutineContextInInlinedLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/coroutineContextInInlinedLambda.kt"); } @TestMetadata("createCoroutineSafe.kt") - public void testCreateCoroutineSafe_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt", "kotlin.coroutines"); + public void testCreateCoroutineSafe() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutineSafe.kt"); } @TestMetadata("createCoroutinesOnManualInstances.kt") - public void testCreateCoroutinesOnManualInstances_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt", "kotlin.coroutines"); + public void testCreateCoroutinesOnManualInstances() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/createCoroutinesOnManualInstances.kt"); } @TestMetadata("crossInlineWithCapturedOuterReceiver.kt") - public void testCrossInlineWithCapturedOuterReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt", "kotlin.coroutines"); + public void testCrossInlineWithCapturedOuterReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt", "kotlin.coroutines"); + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @TestMetadata("delegatedSuspendMember.kt") - public void testDelegatedSuspendMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt", "kotlin.coroutines"); + public void testDelegatedSuspendMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt"); } @TestMetadata("doubleColonExpressionsGenerationInBuilderInference.kt") @@ -5529,8 +5513,8 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("emptyClosure.kt") - public void testEmptyClosure_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/emptyClosure.kt", "kotlin.coroutines"); + public void testEmptyClosure() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/emptyClosure.kt"); } @TestMetadata("emptyCommonConstraintSystemForCoroutineInferenceCall.kt") @@ -5539,118 +5523,118 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("epam.kt") - public void testEpam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/epam.kt", "kotlin.coroutines"); + public void testEpam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/epam.kt"); } @TestMetadata("falseUnitCoercion.kt") - public void testFalseUnitCoercion_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt", "kotlin.coroutines"); + public void testFalseUnitCoercion() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/falseUnitCoercion.kt"); } @TestMetadata("generate.kt") - public void testGenerate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/generate.kt", "kotlin.coroutines"); + public void testGenerate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/generate.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleException.kt"); } @TestMetadata("handleResultCallEmptyBody.kt") - public void testHandleResultCallEmptyBody_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt", "kotlin.coroutines"); + public void testHandleResultCallEmptyBody() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultCallEmptyBody.kt"); } @TestMetadata("handleResultNonUnitExpression.kt") - public void testHandleResultNonUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt", "kotlin.coroutines"); + public void testHandleResultNonUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultNonUnitExpression.kt"); } @TestMetadata("handleResultSuspended.kt") - public void testHandleResultSuspended_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt", "kotlin.coroutines"); + public void testHandleResultSuspended() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/handleResultSuspended.kt"); } @TestMetadata("indirectInlineUsedAsNonInline.kt") - public void testIndirectInlineUsedAsNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt", "kotlin.coroutines"); + public void testIndirectInlineUsedAsNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/indirectInlineUsedAsNonInline.kt"); } @TestMetadata("inlineFunInGenericClass.kt") - public void testInlineFunInGenericClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt", "kotlin.coroutines"); + public void testInlineFunInGenericClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineFunInGenericClass.kt"); } @TestMetadata("inlineGenericFunCalledFromSubclass.kt") - public void testInlineGenericFunCalledFromSubclass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt", "kotlin.coroutines"); + public void testInlineGenericFunCalledFromSubclass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineGenericFunCalledFromSubclass.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendFunction.kt"); } @TestMetadata("inlineSuspendLambdaNonLocalReturn.kt") - public void testInlineSuspendLambdaNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt", "kotlin.coroutines"); + public void testInlineSuspendLambdaNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineSuspendLambdaNonLocalReturn.kt"); } @TestMetadata("inlinedTryCatchFinally.kt") - public void testInlinedTryCatchFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt", "kotlin.coroutines"); + public void testInlinedTryCatchFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlinedTryCatchFinally.kt"); } @TestMetadata("innerSuspensionCalls.kt") - public void testInnerSuspensionCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt", "kotlin.coroutines"); + public void testInnerSuspensionCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/innerSuspensionCalls.kt"); } @TestMetadata("instanceOfContinuation.kt") - public void testInstanceOfContinuation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt", "kotlin.coroutines"); + public void testInstanceOfContinuation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/instanceOfContinuation.kt"); } @TestMetadata("iterateOverArray.kt") - public void testIterateOverArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/iterateOverArray.kt", "kotlin.coroutines"); + public void testIterateOverArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/iterateOverArray.kt"); } @TestMetadata("kt12958.kt") - public void testKt12958_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt12958.kt", "kotlin.coroutines"); + public void testKt12958() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt12958.kt"); } @TestMetadata("kt15016.kt") - public void testKt15016_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15016.kt", "kotlin.coroutines"); + public void testKt15016() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15016.kt"); } @TestMetadata("kt15017.kt") - public void testKt15017_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15017.kt", "kotlin.coroutines"); + public void testKt15017() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15017.kt"); } @TestMetadata("kt15930.kt") - public void testKt15930_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt15930.kt", "kotlin.coroutines"); + public void testKt15930() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt15930.kt"); } @TestMetadata("kt21605.kt") - public void testKt21605_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt21605.kt", "kotlin.coroutines"); + public void testKt21605() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt21605.kt"); } @TestMetadata("kt25912.kt") - public void testKt25912_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt25912.kt", "kotlin.coroutines"); + public void testKt25912() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt25912.kt"); } @TestMetadata("kt28844.kt") - public void testKt28844_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/kt28844.kt", "kotlin.coroutines"); + public void testKt28844() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/kt28844.kt"); } @TestMetadata("kt30858.kt") @@ -5679,23 +5663,23 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("lastExpressionIsLoop.kt") - public void testLastExpressionIsLoop_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt", "kotlin.coroutines"); + public void testLastExpressionIsLoop() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastExpressionIsLoop.kt"); } @TestMetadata("lastStatementInc.kt") - public void testLastStatementInc_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStatementInc.kt", "kotlin.coroutines"); + public void testLastStatementInc() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStatementInc.kt"); } @TestMetadata("lastStementAssignment.kt") - public void testLastStementAssignment_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt", "kotlin.coroutines"); + public void testLastStementAssignment() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastStementAssignment.kt"); } @TestMetadata("lastUnitExpression.kt") - public void testLastUnitExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt", "kotlin.coroutines"); + public void testLastUnitExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/lastUnitExpression.kt"); } @TestMetadata("localCallableRef.kt") @@ -5704,53 +5688,53 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("localDelegate.kt") - public void testLocalDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localDelegate.kt", "kotlin.coroutines"); + public void testLocalDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localDelegate.kt"); } @TestMetadata("longRangeInSuspendCall.kt") - public void testLongRangeInSuspendCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendCall.kt"); } @TestMetadata("longRangeInSuspendFun.kt") - public void testLongRangeInSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt", "kotlin.coroutines"); + public void testLongRangeInSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/longRangeInSuspendFun.kt"); } @TestMetadata("mergeNullAndString.kt") - public void testMergeNullAndString_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") - public void testMultipleInvokeCallsInsideInlineLambda1_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") - public void testMultipleInvokeCallsInsideInlineLambda2_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt", "kotlin.coroutines"); - } - - @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") - public void testMultipleInvokeCallsInsideInlineLambda3_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt", "kotlin.coroutines"); + public void testMergeNullAndString() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/mergeNullAndString.kt"); } @TestMetadata("multipleInvokeCalls.kt") - public void testMultipleInvokeCalls_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt", "kotlin.coroutines"); + public void testMultipleInvokeCalls() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCalls.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda1.kt") + public void testMultipleInvokeCallsInsideInlineLambda1() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda1.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda2.kt") + public void testMultipleInvokeCallsInsideInlineLambda2() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda2.kt"); + } + + @TestMetadata("multipleInvokeCallsInsideInlineLambda3.kt") + public void testMultipleInvokeCallsInsideInlineLambda3() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multipleInvokeCallsInsideInlineLambda3.kt"); } @TestMetadata("nestedTryCatch.kt") - public void testNestedTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt", "kotlin.coroutines"); + public void testNestedTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nestedTryCatch.kt"); } @TestMetadata("noSuspensionPoints.kt") - public void testNoSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt", "kotlin.coroutines"); + public void testNoSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/noSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -5758,34 +5742,39 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/nonLocalReturn.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") - public void testNonLocalReturnFromInlineLambdaDeep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambda.kt") + public void testNonLocalReturnFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt"); } - @TestMetadata("nonLocalReturnFromInlineLambda.kt") - public void testNonLocalReturnFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambda.kt", "kotlin.coroutines"); + @TestMetadata("nonLocalReturnFromInlineLambdaDeep.kt") + public void testNonLocalReturnFromInlineLambdaDeep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/nonLocalReturnFromInlineLambdaDeep.kt"); } @TestMetadata("overrideDefaultArgument.kt") - public void testOverrideDefaultArgument_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt", "kotlin.coroutines"); + public void testOverrideDefaultArgument() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt"); } @TestMetadata("recursiveSuspend.kt") - public void testRecursiveSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt", "kotlin.coroutines"); + public void testRecursiveSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/recursiveSuspend.kt"); } @TestMetadata("returnByLabel.kt") - public void testReturnByLabel_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/returnByLabel.kt", "kotlin.coroutines"); + 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"); } @TestMetadata("simpleException.kt") - public void testSimpleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleException.kt", "kotlin.coroutines"); + public void testSimpleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleException.kt"); } @TestMetadata("simpleSuspendCallableReference.kt") @@ -5794,18 +5783,13 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("simpleWithHandleResult.kt") - public void testSimpleWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt", "kotlin.coroutines"); - } - - @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/simple.kt", "kotlin.coroutines"); + public void testSimpleWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/simpleWithHandleResult.kt"); } @TestMetadata("statementLikeLastExpression.kt") - public void testStatementLikeLastExpression_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt", "kotlin.coroutines"); + public void testStatementLikeLastExpression() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/statementLikeLastExpression.kt"); } @TestMetadata("stopAfter.kt") @@ -5814,33 +5798,33 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("suspendCallsInArguments.kt") - public void testSuspendCallsInArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt", "kotlin.coroutines"); + public void testSuspendCallsInArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCallsInArguments.kt"); } @TestMetadata("suspendCoroutineFromStateMachine.kt") - public void testSuspendCoroutineFromStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt", "kotlin.coroutines"); + public void testSuspendCoroutineFromStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendCoroutineFromStateMachine.kt"); } @TestMetadata("suspendDefaultImpl.kt") - public void testSuspendDefaultImpl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt", "kotlin.coroutines"); + public void testSuspendDefaultImpl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDefaultImpl.kt"); } @TestMetadata("suspendDelegation.kt") - public void testSuspendDelegation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendDelegation.kt", "kotlin.coroutines"); + public void testSuspendDelegation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendDelegation.kt"); } @TestMetadata("suspendFromInlineLambda.kt") - public void testSuspendFromInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt", "kotlin.coroutines"); + public void testSuspendFromInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFromInlineLambda.kt"); } @TestMetadata("suspendFunImportedFromObject.kt") - public void testSuspendFunImportedFromObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt", "kotlin.coroutines"); + public void testSuspendFunImportedFromObject() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunImportedFromObject.kt"); } @TestMetadata("suspendFunctionMethodReference.kt") @@ -5849,23 +5833,23 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInCycle.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") - public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") - public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInCycle.kt"); } @TestMetadata("suspendInTheMiddleOfObjectConstruction.kt") - public void testSuspendInTheMiddleOfObjectConstruction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt", "kotlin.coroutines"); + public void testSuspendInTheMiddleOfObjectConstruction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstruction.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt") + public void testSuspendInTheMiddleOfObjectConstructionEvaluationOrder() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionEvaluationOrder.kt"); + } + + @TestMetadata("suspendInTheMiddleOfObjectConstructionWithJumpOut.kt") + public void testSuspendInTheMiddleOfObjectConstructionWithJumpOut() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendInTheMiddleOfObjectConstructionWithJumpOut.kt"); } @TestMetadata("suspendLambdaInInterface.kt") @@ -5874,18 +5858,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("suspendLambdaWithArgumentRearrangement.kt") - public void testSuspendLambdaWithArgumentRearrangement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspensionInsideSafeCallWithElvis.kt") - public void testSuspensionInsideSafeCallWithElvis_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt", "kotlin.coroutines"); + public void testSuspendLambdaWithArgumentRearrangement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendLambdaWithArgumentRearrangement.kt"); } @TestMetadata("suspensionInsideSafeCall.kt") - public void testSuspensionInsideSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt", "kotlin.coroutines"); + public void testSuspensionInsideSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCall.kt"); + } + + @TestMetadata("suspensionInsideSafeCallWithElvis.kt") + public void testSuspensionInsideSafeCallWithElvis() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspensionInsideSafeCallWithElvis.kt"); } @TestMetadata("tailCallToNothing.kt") @@ -5894,38 +5878,38 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("tryCatchFinallyWithHandleResult.kt") - public void testTryCatchFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchFinallyWithHandleResult.kt"); } @TestMetadata("tryCatchWithHandleResult.kt") - public void testTryCatchWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt", "kotlin.coroutines"); + public void testTryCatchWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryCatchWithHandleResult.kt"); } @TestMetadata("tryFinallyInsideInlineLambda.kt") - public void testTryFinallyInsideInlineLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt", "kotlin.coroutines"); + public void testTryFinallyInsideInlineLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyInsideInlineLambda.kt"); } @TestMetadata("tryFinallyWithHandleResult.kt") - public void testTryFinallyWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt", "kotlin.coroutines"); + public void testTryFinallyWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tryFinallyWithHandleResult.kt"); } @TestMetadata("varCaptuedInCoroutineIntrinsic.kt") - public void testVarCaptuedInCoroutineIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt", "kotlin.coroutines"); - } - - @TestMetadata("varValueConflictsWithTableSameSort.kt") - public void testVarValueConflictsWithTableSameSort_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt", "kotlin.coroutines"); + public void testVarCaptuedInCoroutineIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varCaptuedInCoroutineIntrinsic.kt"); } @TestMetadata("varValueConflictsWithTable.kt") - public void testVarValueConflictsWithTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt", "kotlin.coroutines"); + public void testVarValueConflictsWithTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTable.kt"); + } + + @TestMetadata("varValueConflictsWithTableSameSort.kt") + public void testVarValueConflictsWithTableSameSort() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varValueConflictsWithTableSameSort.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/bridges") @@ -5936,27 +5920,23 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInBridges() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/bridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("interfaceSpecialization.kt") - public void testInterfaceSpecialization_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt", "kotlin.coroutines"); + public void testInterfaceSpecialization() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt"); } @TestMetadata("lambdaWithLongReceiver.kt") - public void testLambdaWithLongReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt", "kotlin.coroutines"); + public void testLambdaWithLongReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver.kt"); } @TestMetadata("lambdaWithMultipleParameters.kt") - public void testLambdaWithMultipleParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt", "kotlin.coroutines"); + public void testLambdaWithMultipleParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters.kt"); } } @@ -5968,62 +5948,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInControlFlow() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/controlFlow"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("breakFinally.kt") - public void testBreakFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt", "kotlin.coroutines"); + public void testBreakFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakFinally.kt"); } @TestMetadata("breakStatement.kt") - public void testBreakStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt", "kotlin.coroutines"); + public void testBreakStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/breakStatement.kt"); } @TestMetadata("complexChainSuspend.kt") - public void testComplexChainSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt", "kotlin.coroutines"); + public void testComplexChainSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/complexChainSuspend.kt"); } @TestMetadata("doWhileStatement.kt") - public void testDoWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt", "kotlin.coroutines"); + public void testDoWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doWhileStatement.kt"); } @TestMetadata("doubleBreak.kt") - public void testDoubleBreak_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt", "kotlin.coroutines"); + public void testDoubleBreak() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/doubleBreak.kt"); } @TestMetadata("finallyCatch.kt") - public void testFinallyCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt", "kotlin.coroutines"); + public void testFinallyCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/finallyCatch.kt"); } @TestMetadata("forContinue.kt") - public void testForContinue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt", "kotlin.coroutines"); + public void testForContinue() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forContinue.kt"); } @TestMetadata("forStatement.kt") - public void testForStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt", "kotlin.coroutines"); + public void testForStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forStatement.kt"); } @TestMetadata("forWithStep.kt") - public void testForWithStep_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt", "kotlin.coroutines"); + public void testForWithStep() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/forWithStep.kt"); } @TestMetadata("ifStatement.kt") - public void testIfStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt", "kotlin.coroutines"); + public void testIfStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/ifStatement.kt"); } @TestMetadata("kt22694_1_3.kt") @@ -6032,58 +6008,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("labeledWhile.kt") - public void testLabeledWhile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt", "kotlin.coroutines"); + public void testLabeledWhile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/labeledWhile.kt"); } @TestMetadata("multipleCatchBlocksSuspend.kt") - public void testMultipleCatchBlocksSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt", "kotlin.coroutines"); + public void testMultipleCatchBlocksSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/multipleCatchBlocksSuspend.kt"); } @TestMetadata("returnFromFinally.kt") - public void testReturnFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt", "kotlin.coroutines"); + public void testReturnFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnFromFinally.kt"); } @TestMetadata("returnWithFinally.kt") - public void testReturnWithFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt", "kotlin.coroutines"); + public void testReturnWithFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/returnWithFinally.kt"); } @TestMetadata("suspendInStringTemplate.kt") - public void testSuspendInStringTemplate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt", "kotlin.coroutines"); + public void testSuspendInStringTemplate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/suspendInStringTemplate.kt"); } @TestMetadata("switchLikeWhen.kt") - public void testSwitchLikeWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt", "kotlin.coroutines"); + public void testSwitchLikeWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/switchLikeWhen.kt"); } @TestMetadata("throwFromCatch.kt") - public void testThrowFromCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt", "kotlin.coroutines"); + public void testThrowFromCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromCatch.kt"); } @TestMetadata("throwFromFinally.kt") - public void testThrowFromFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt", "kotlin.coroutines"); + public void testThrowFromFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwFromFinally.kt"); } @TestMetadata("throwInTryWithHandleResult.kt") - public void testThrowInTryWithHandleResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt", "kotlin.coroutines"); + public void testThrowInTryWithHandleResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/throwInTryWithHandleResult.kt"); } @TestMetadata("whenWithSuspensions.kt") - public void testWhenWithSuspensions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt", "kotlin.coroutines"); + public void testWhenWithSuspensions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt"); } @TestMetadata("whileStatement.kt") - public void testWhileStatement_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt", "kotlin.coroutines"); + public void testWhileStatement() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/controlFlow/whileStatement.kt"); } } @@ -6108,17 +6084,13 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInFeatureIntersection() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("breakWithNonEmptyStack.kt") - public void testBreakWithNonEmptyStack_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt", "kotlin.coroutines"); + public void testBreakWithNonEmptyStack() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/breakWithNonEmptyStack.kt"); } @TestMetadata("defaultExpect.kt") @@ -6127,18 +6099,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("delegate.kt") - public void testDelegate_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt", "kotlin.coroutines"); + public void testDelegate() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/delegate.kt"); } @TestMetadata("destructuringInLambdas.kt") - public void testDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt", "kotlin.coroutines"); + public void testDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/destructuringInLambdas.kt"); } @TestMetadata("inlineSuspendFinally.kt") - public void testInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt", "kotlin.coroutines"); + public void testInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/inlineSuspendFinally.kt"); } @TestMetadata("interfaceMethodWithBody.kt") @@ -6156,19 +6128,19 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/featureIntersection/overrideInInlineClass.kt"); } - @TestMetadata("safeCallOnTwoReceiversLong.kt") - public void testSafeCallOnTwoReceiversLong_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceivers.kt") + public void testSafeCallOnTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt"); } - @TestMetadata("safeCallOnTwoReceivers.kt") - public void testSafeCallOnTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("safeCallOnTwoReceiversLong.kt") + public void testSafeCallOnTwoReceiversLong() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt"); } @TestMetadata("suspendDestructuringInLambdas.kt") - public void testSuspendDestructuringInLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt", "kotlin.coroutines"); + public void testSuspendDestructuringInLambdas() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendDestructuringInLambdas.kt"); } @TestMetadata("suspendFunctionIsAs.kt") @@ -6177,23 +6149,23 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("suspendInlineSuspendFinally.kt") - public void testSuspendInlineSuspendFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusAssign.kt") - public void testSuspendOperatorPlusAssign_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt", "kotlin.coroutines"); - } - - @TestMetadata("suspendOperatorPlusCallFromLambda.kt") - public void testSuspendOperatorPlusCallFromLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt", "kotlin.coroutines"); + public void testSuspendInlineSuspendFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendInlineSuspendFinally.kt"); } @TestMetadata("suspendOperatorPlus.kt") - public void testSuspendOperatorPlus_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt", "kotlin.coroutines"); + public void testSuspendOperatorPlus() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlus.kt"); + } + + @TestMetadata("suspendOperatorPlusAssign.kt") + public void testSuspendOperatorPlusAssign() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusAssign.kt"); + } + + @TestMetadata("suspendOperatorPlusCallFromLambda.kt") + public void testSuspendOperatorPlusCallFromLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/suspendOperatorPlusCallFromLambda.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference") @@ -6204,17 +6176,13 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInCallableReference() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("bigArity.kt") - public void testBigArity_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt", "kotlin.coroutines"); + public void testBigArity() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/callableReference/bigArity.kt"); } @TestMetadata("longArgs.kt") @@ -6285,77 +6253,73 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInTailrec() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("controlFlowIf.kt") - public void testControlFlowIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt", "kotlin.coroutines"); + public void testControlFlowIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowIf.kt"); } @TestMetadata("controlFlowWhen.kt") - public void testControlFlowWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt", "kotlin.coroutines"); + public void testControlFlowWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/controlFlowWhen.kt"); } @TestMetadata("extention.kt") - public void testExtention_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt", "kotlin.coroutines"); + public void testExtention() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/extention.kt"); } @TestMetadata("infixCall.kt") - public void testInfixCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt", "kotlin.coroutines"); + public void testInfixCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt"); } @TestMetadata("infixRecursiveCall.kt") - public void testInfixRecursiveCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt", "kotlin.coroutines"); + public void testInfixRecursiveCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt"); } @TestMetadata("realIteratorFoldl.kt") - public void testRealIteratorFoldl_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt", "kotlin.coroutines"); + public void testRealIteratorFoldl() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt"); } @TestMetadata("realStringEscape.kt") - public void testRealStringEscape_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt", "kotlin.coroutines"); + public void testRealStringEscape() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringEscape.kt"); } @TestMetadata("realStringRepeat.kt") - public void testRealStringRepeat_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt", "kotlin.coroutines"); + public void testRealStringRepeat() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt"); } @TestMetadata("returnInParentheses.kt") - public void testReturnInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt", "kotlin.coroutines"); + public void testReturnInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt"); } @TestMetadata("sum.kt") - public void testSum_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt", "kotlin.coroutines"); + public void testSum() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt"); } @TestMetadata("tailCallInBlockInParentheses.kt") - public void testTailCallInBlockInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInBlockInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt"); } @TestMetadata("tailCallInParentheses.kt") - public void testTailCallInParentheses_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt", "kotlin.coroutines"); + public void testTailCallInParentheses() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt"); } @TestMetadata("whenWithIs.kt") - public void testWhenWithIs_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt", "kotlin.coroutines"); + public void testWhenWithIs() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt"); } } } @@ -6385,10 +6349,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInDirect() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/direct"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -6404,58 +6364,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -6569,8 +6529,8 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -6579,28 +6539,28 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -6617,10 +6577,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInResume() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resume"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -6636,58 +6592,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -6801,8 +6757,8 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -6811,28 +6767,28 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -6849,10 +6805,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInResumeWithException() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -6868,58 +6820,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("boxUnboxInsideCoroutine.kt") - public void testBoxUnboxInsideCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Any.kt") - public void testBoxUnboxInsideCoroutine_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Any.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineAny.kt") - public void testBoxUnboxInsideCoroutine_InlineAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_InlineInt.kt") - public void testBoxUnboxInsideCoroutine_InlineInt_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_InlineInt() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_InlineInt.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Int.kt") - public void testBoxUnboxInsideCoroutine_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Int.kt"); } @TestMetadata("boxUnboxInsideCoroutine_Long.kt") - public void testBoxUnboxInsideCoroutine_Long_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_Long() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_Long.kt"); } @TestMetadata("boxUnboxInsideCoroutine_NAny.kt") - public void testBoxUnboxInsideCoroutine_NAny_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_NAny() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_NAny.kt"); } @TestMetadata("boxUnboxInsideCoroutine_nonLocalReturn.kt") - public void testBoxUnboxInsideCoroutine_nonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_nonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_nonLocalReturn.kt"); } @TestMetadata("boxUnboxInsideCoroutine_suspendFunType.kt") - public void testBoxUnboxInsideCoroutine_suspendFunType_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt", "kotlin.coroutines"); + public void testBoxUnboxInsideCoroutine_suspendFunType() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine_suspendFunType.kt"); } @TestMetadata("bridgeGenerationCrossinline.kt") - public void testBridgeGenerationCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt", "kotlin.coroutines"); + public void testBridgeGenerationCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationCrossinline.kt"); } @TestMetadata("bridgeGenerationNonInline.kt") - public void testBridgeGenerationNonInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt", "kotlin.coroutines"); + public void testBridgeGenerationNonInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/bridgeGenerationNonInline.kt"); } @TestMetadata("covariantOverrideSuspendFun.kt") @@ -7018,8 +6970,8 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("interfaceDelegateWithInlineClass.kt") - public void testInterfaceDelegateWithInlineClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt", "kotlin.coroutines"); + public void testInterfaceDelegateWithInlineClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/interfaceDelegateWithInlineClass.kt"); } @TestMetadata("invokeOperator.kt") @@ -7028,28 +6980,28 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("overrideSuspendFun.kt") - public void testOverrideSuspendFun_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun.kt"); } @TestMetadata("overrideSuspendFun_Any.kt") - public void testOverrideSuspendFun_Any_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any.kt"); } @TestMetadata("overrideSuspendFun_Any_itf.kt") - public void testOverrideSuspendFun_Any_itf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_itf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_itf.kt"); } @TestMetadata("overrideSuspendFun_Any_this.kt") - public void testOverrideSuspendFun_Any_this_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Any_this() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Any_this.kt"); } @TestMetadata("overrideSuspendFun_Int.kt") - public void testOverrideSuspendFun_Int_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt", "kotlin.coroutines"); + public void testOverrideSuspendFun_Int() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/overrideSuspendFun_Int.kt"); } @TestMetadata("returnResult.kt") @@ -7067,22 +7019,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInIntLikeVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intLikeVarSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("complicatedMerge.kt") - public void testComplicatedMerge_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt", "kotlin.coroutines"); + public void testComplicatedMerge() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/complicatedMerge.kt"); } @TestMetadata("i2bResult.kt") - public void testI2bResult_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt", "kotlin.coroutines"); + public void testI2bResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/i2bResult.kt"); } @TestMetadata("listThrowablePairInOneSlot.kt") @@ -7091,33 +7039,33 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("loadFromBooleanArray.kt") - public void testLoadFromBooleanArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt", "kotlin.coroutines"); + public void testLoadFromBooleanArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromBooleanArray.kt"); } @TestMetadata("loadFromByteArray.kt") - public void testLoadFromByteArray_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt", "kotlin.coroutines"); + public void testLoadFromByteArray() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/loadFromByteArray.kt"); } @TestMetadata("noVariableInTable.kt") - public void testNoVariableInTable_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt", "kotlin.coroutines"); + public void testNoVariableInTable() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/noVariableInTable.kt"); } @TestMetadata("sameIconst1ManyVars.kt") - public void testSameIconst1ManyVars_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt", "kotlin.coroutines"); + public void testSameIconst1ManyVars() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/sameIconst1ManyVars.kt"); } @TestMetadata("usedInMethodCall.kt") - public void testUsedInMethodCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt", "kotlin.coroutines"); + public void testUsedInMethodCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInMethodCall.kt"); } @TestMetadata("usedInVarStore.kt") - public void testUsedInVarStore_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt", "kotlin.coroutines"); + public void testUsedInVarStore() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intLikeVarSpilling/usedInVarStore.kt"); } } @@ -7129,52 +7077,48 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInIntrinsicSemantics() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/intrinsicSemantics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } - @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") - public void testCoroutineContextReceiverNotIntrinsic_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContext.kt") + public void testCoroutineContext() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt"); } @TestMetadata("coroutineContextReceiver.kt") - public void testCoroutineContextReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt", "kotlin.coroutines"); + public void testCoroutineContextReceiver() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiver.kt"); } - @TestMetadata("coroutineContext.kt") - public void testCoroutineContext_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContext.kt", "kotlin.coroutines"); + @TestMetadata("coroutineContextReceiverNotIntrinsic.kt") + public void testCoroutineContextReceiverNotIntrinsic() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt"); } @TestMetadata("intercepted.kt") - public void testIntercepted_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturnInterception.kt") - public void testStartCoroutineUninterceptedOrReturnInterception_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt", "kotlin.coroutines"); - } - - @TestMetadata("startCoroutineUninterceptedOrReturn.kt") - public void testStartCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testIntercepted() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt"); } @TestMetadata("startCoroutine.kt") - public void testStartCoroutine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt", "kotlin.coroutines"); + 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("startCoroutineUninterceptedOrReturnInterception.kt") + public void testStartCoroutineUninterceptedOrReturnInterception() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt"); } @TestMetadata("suspendCoroutineUninterceptedOrReturn.kt") - public void testSuspendCoroutineUninterceptedOrReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt", "kotlin.coroutines"); + public void testSuspendCoroutineUninterceptedOrReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt"); } } @@ -7186,10 +7130,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInJavaInterop() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/javaInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -7215,17 +7155,13 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInAnonymous() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/anonymous"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt"); } } @@ -7237,62 +7173,58 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInNamed() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/localFunctions/named"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("capturedParameters.kt") - public void testCapturedParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt", "kotlin.coroutines"); + public void testCapturedParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedParameters.kt"); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/capturedVariables.kt"); } @TestMetadata("extension.kt") - public void testExtension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt", "kotlin.coroutines"); + public void testExtension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/extension.kt"); } @TestMetadata("infix.kt") - public void testInfix_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt", "kotlin.coroutines"); + public void testInfix() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/infix.kt"); } @TestMetadata("insideLambda.kt") - public void testInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt", "kotlin.coroutines"); + public void testInsideLambda() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/insideLambda.kt"); } @TestMetadata("nestedLocals.kt") - public void testNestedLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt", "kotlin.coroutines"); - } - - @TestMetadata("simpleSuspensionPoint.kt") - public void testSimpleSuspensionPoint_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt", "kotlin.coroutines"); + public void testNestedLocals() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/nestedLocals.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simple.kt"); + } + + @TestMetadata("simpleSuspensionPoint.kt") + public void testSimpleSuspensionPoint() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/simpleSuspensionPoint.kt"); } @TestMetadata("stateMachine.kt") - public void testStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt", "kotlin.coroutines"); + public void testStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt"); } @TestMetadata("withArguments.kt") - public void testWithArguments_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt", "kotlin.coroutines"); + public void testWithArguments() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/localFunctions/named/withArguments.kt"); } } } @@ -7305,52 +7237,48 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInMultiModule() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/multiModule"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("inlineCrossModule.kt") - public void testInlineCrossModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt", "kotlin.coroutines"); + public void testInlineCrossModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt"); } @TestMetadata("inlineFunctionWithOptionalParam.kt") - public void testInlineFunctionWithOptionalParam_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleOverride.kt") - public void testInlineMultiModuleOverride_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithController.kt") - public void testInlineMultiModuleWithController_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt", "kotlin.coroutines"); - } - - @TestMetadata("inlineMultiModuleWithInnerInlining.kt") - public void testInlineMultiModuleWithInnerInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt", "kotlin.coroutines"); + public void testInlineFunctionWithOptionalParam() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt"); } @TestMetadata("inlineMultiModule.kt") - public void testInlineMultiModule_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt", "kotlin.coroutines"); + public void testInlineMultiModule() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt"); + } + + @TestMetadata("inlineMultiModuleOverride.kt") + public void testInlineMultiModuleOverride() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt"); + } + + @TestMetadata("inlineMultiModuleWithController.kt") + public void testInlineMultiModuleWithController() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt"); + } + + @TestMetadata("inlineMultiModuleWithInnerInlining.kt") + public void testInlineMultiModuleWithInnerInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt"); } @TestMetadata("inlineTailCall.kt") - public void testInlineTailCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt", "kotlin.coroutines"); + public void testInlineTailCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/multiModule/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/multiModule/simple.kt"); } } @@ -7362,17 +7290,13 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInRedundantLocalsElimination() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/redundantLocalsElimination"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("ktor_receivedMessage.kt") - public void testKtor_receivedMessage_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt", "kotlin.coroutines"); + public void testKtor_receivedMessage() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/redundantLocalsElimination/ktor_receivedMessage.kt"); } } @@ -7397,42 +7321,38 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInStackUnwinding() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/stackUnwinding"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("exception.kt") - public void testException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt", "kotlin.coroutines"); + public void testException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/exception.kt"); } @TestMetadata("inlineSuspendFunction.kt") - public void testInlineSuspendFunction_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines"); - } - - @TestMetadata("rethrowInFinallyWithSuspension.kt") - public void testRethrowInFinallyWithSuspension_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines"); + public void testInlineSuspendFunction() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt"); } @TestMetadata("rethrowInFinally.kt") - public void testRethrowInFinally_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines"); + public void testRethrowInFinally() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt"); + } + + @TestMetadata("rethrowInFinallyWithSuspension.kt") + public void testRethrowInFinallyWithSuspension() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt"); } @TestMetadata("suspendInCycle.kt") - public void testSuspendInCycle_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt", "kotlin.coroutines"); + public void testSuspendInCycle() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/stackUnwinding/suspendInCycle.kt"); } } @@ -7477,22 +7397,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionAsCoroutine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("dispatchResume.kt") - public void testDispatchResume_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt", "kotlin.coroutines"); + public void testDispatchResume() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/dispatchResume.kt"); } @TestMetadata("handleException.kt") - public void testHandleException_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt", "kotlin.coroutines"); + public void testHandleException() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/handleException.kt"); } @TestMetadata("ifExpressionInsideCoroutine_1_3.kt") @@ -7500,74 +7416,74 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/ifExpressionInsideCoroutine_1_3.kt"); } - @TestMetadata("inlineTwoReceivers.kt") - public void testInlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt", "kotlin.coroutines"); + @TestMetadata("inline.kt") + public void testInline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt"); } - @TestMetadata("inline.kt") - public void testInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inline.kt", "kotlin.coroutines"); + @TestMetadata("inlineTwoReceivers.kt") + public void testInlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/inlineTwoReceivers.kt"); } @TestMetadata("member.kt") - public void testMember_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt", "kotlin.coroutines"); + public void testMember() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/member.kt"); } @TestMetadata("noinlineTwoReceivers.kt") - public void testNoinlineTwoReceivers_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt", "kotlin.coroutines"); + public void testNoinlineTwoReceivers() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/noinlineTwoReceivers.kt"); } @TestMetadata("operators.kt") - public void testOperators_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt", "kotlin.coroutines"); + public void testOperators() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/operators.kt"); } @TestMetadata("privateFunctions.kt") - public void testPrivateFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt", "kotlin.coroutines"); + public void testPrivateFunctions() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateFunctions.kt"); } @TestMetadata("privateInFile.kt") - public void testPrivateInFile_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt", "kotlin.coroutines"); + public void testPrivateInFile() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/privateInFile.kt"); } @TestMetadata("returnNoSuspend.kt") - public void testReturnNoSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt", "kotlin.coroutines"); + public void testReturnNoSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/returnNoSuspend.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallAbstractClass.kt") - public void testSuperCallAbstractClass_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallInterface.kt") - public void testSuperCallInterface_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt", "kotlin.coroutines"); - } - - @TestMetadata("superCallOverload.kt") - public void testSuperCallOverload_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/simple.kt"); } @TestMetadata("superCall.kt") - public void testSuperCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt", "kotlin.coroutines"); + public void testSuperCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt"); + } + + @TestMetadata("superCallAbstractClass.kt") + public void testSuperCallAbstractClass() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt"); + } + + @TestMetadata("superCallInterface.kt") + public void testSuperCallInterface() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt"); + } + + @TestMetadata("superCallOverload.kt") + public void testSuperCallOverload() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt"); } @TestMetadata("withVariables.kt") - public void testWithVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt", "kotlin.coroutines"); + public void testWithVariables() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/withVariables.kt"); } } @@ -7579,37 +7495,33 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInSuspendFunctionTypeCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("localVal.kt") - public void testLocalVal_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt", "kotlin.coroutines"); - } - - @TestMetadata("manyParametersNoCapture.kt") - public void testManyParametersNoCapture_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt", "kotlin.coroutines"); + public void testLocalVal() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/localVal.kt"); } @TestMetadata("manyParameters.kt") - public void testManyParameters_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt", "kotlin.coroutines"); + public void testManyParameters() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParameters.kt"); + } + + @TestMetadata("manyParametersNoCapture.kt") + public void testManyParametersNoCapture() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/manyParametersNoCapture.kt"); } @TestMetadata("simple.kt") - public void testSimple_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt", "kotlin.coroutines"); + public void testSimple() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/simple.kt"); } @TestMetadata("suspendModifier.kt") - public void testSuspendModifier_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt", "kotlin.coroutines"); + public void testSuspendModifier() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/suspendFunctionTypeCall/suspendModifier.kt"); } } @@ -7621,32 +7533,28 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInTailCallOptimizations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailCallOptimizations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("crossinline.kt") - public void testCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt", "kotlin.coroutines"); + public void testCrossinline() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.kt"); } @TestMetadata("inlineWithoutStateMachine.kt") - public void testInlineWithoutStateMachine_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt", "kotlin.coroutines"); + public void testInlineWithoutStateMachine() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/inlineWithoutStateMachine.kt"); } @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt", "kotlin.coroutines"); + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.kt"); } @TestMetadata("tryCatch.kt") - public void testTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt", "kotlin.coroutines"); + public void testTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailCallOptimizations/tryCatch.kt"); } @TestMetadata("compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit") @@ -7671,32 +7579,28 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInTailOperations() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/tailOperations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("suspendWithIf.kt") - public void testSuspendWithIf_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt", "kotlin.coroutines"); + public void testSuspendWithIf() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithIf.kt"); } @TestMetadata("suspendWithTryCatch.kt") - public void testSuspendWithTryCatch_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt", "kotlin.coroutines"); + public void testSuspendWithTryCatch() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithTryCatch.kt"); } @TestMetadata("suspendWithWhen.kt") - public void testSuspendWithWhen_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt", "kotlin.coroutines"); + public void testSuspendWithWhen() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/suspendWithWhen.kt"); } @TestMetadata("tailInlining.kt") - public void testTailInlining_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt", "kotlin.coroutines"); + public void testTailInlining() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt"); } } @@ -7708,22 +7612,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInUnitTypeReturn() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/unitTypeReturn"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("coroutineNonLocalReturn.kt") - public void testCoroutineNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt", "kotlin.coroutines"); + public void testCoroutineNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineNonLocalReturn.kt"); } @TestMetadata("coroutineReturn.kt") - public void testCoroutineReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt", "kotlin.coroutines"); + public void testCoroutineReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt"); } @TestMetadata("inlineUnitFunction.kt") @@ -7737,18 +7637,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("suspendNonLocalReturn.kt") - public void testSuspendNonLocalReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt", "kotlin.coroutines"); + public void testSuspendNonLocalReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendNonLocalReturn.kt"); } @TestMetadata("suspendReturn.kt") - public void testSuspendReturn_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt", "kotlin.coroutines"); + public void testSuspendReturn() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/suspendReturn.kt"); } @TestMetadata("unitSafeCall.kt") - public void testUnitSafeCall_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt", "kotlin.coroutines"); + public void testUnitSafeCall() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/unitTypeReturn/unitSafeCall.kt"); } } @@ -7760,10 +7660,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInVarSpilling() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/varSpilling"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @@ -7774,18 +7670,18 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @TestMetadata("kt19475.kt") - public void testKt19475_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt", "kotlin.coroutines"); + public void testKt19475() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt19475.kt"); } @TestMetadata("kt38925.kt") - public void testKt38925_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt", "kotlin.coroutines"); + public void testKt38925() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/kt38925.kt"); } @TestMetadata("nullSpilling.kt") - public void testNullSpilling_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt", "kotlin.coroutines"); + public void testNullSpilling() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/varSpilling/nullSpilling.kt"); } @TestMetadata("refinedIntTypesAnalysis.kt") @@ -16842,10 +16738,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInParametersMetadata() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/parametersMetadata"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java index 9a4df584fd9..0e519de0f46 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java @@ -3557,72 +3557,68 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInSuspend() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("capturedVariables.kt") - public void testCapturedVariables_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt", "kotlin.coroutines"); + public void testCapturedVariables() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/capturedVariables.kt"); } @TestMetadata("crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt") - public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt", "kotlin.coroutines"); + public void testCrossinlineSuspendLambdaInsideCrossinlineSuspendLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/crossinlineSuspendLambdaInsideCrossinlineSuspendLambda.kt"); } @TestMetadata("delegatedProperties.kt") - public void testDelegatedProperties_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt", "kotlin.coroutines"); + public void testDelegatedProperties() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/delegatedProperties.kt"); } @TestMetadata("doubleRegenerationWithNonSuspendingLambda.kt") - public void testDoubleRegenerationWithNonSuspendingLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt", "kotlin.coroutines"); + public void testDoubleRegenerationWithNonSuspendingLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/doubleRegenerationWithNonSuspendingLambda.kt"); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/inlineSuspendOfSuspend.kt"); } @TestMetadata("kt26658.kt") @@ -3631,18 +3627,18 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { } @TestMetadata("maxStackWithCrossinline.kt") - public void testMaxStackWithCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt", "kotlin.coroutines"); + public void testMaxStackWithCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/maxStackWithCrossinline.kt"); } @TestMetadata("multipleLocals.kt") - public void testMultipleLocals_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt", "kotlin.coroutines"); + public void testMultipleLocals() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleLocals.kt"); } @TestMetadata("multipleSuspensionPoints.kt") - public void testMultipleSuspensionPoints_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt", "kotlin.coroutines"); + public void testMultipleSuspensionPoints() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/multipleSuspensionPoints.kt"); } @TestMetadata("nonLocalReturn.kt") @@ -3651,23 +3647,23 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { } @TestMetadata("nonSuspendCrossinline.kt") - public void testNonSuspendCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt", "kotlin.coroutines"); + public void testNonSuspendCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/nonSuspendCrossinline.kt"); } @TestMetadata("returnValue.kt") - public void testReturnValue_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/returnValue.kt", "kotlin.coroutines"); + public void testReturnValue() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/returnValue.kt"); } @TestMetadata("tryCatchReceiver.kt") - public void testTryCatchReceiver_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt", "kotlin.coroutines"); + public void testTryCatchReceiver() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt"); } @TestMetadata("tryCatchStackTransform.kt") - public void testTryCatchStackTransform_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt", "kotlin.coroutines"); + public void testTryCatchStackTransform() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/tryCatchStackTransform.kt"); } @TestMetadata("twiceRegeneratedAnonymousObject.kt") @@ -3726,17 +3722,13 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInDefaultParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/defaultParameter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("defaultValueCrossinline.kt") - public void testDefaultValueCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt", "kotlin.coroutines"); + public void testDefaultValueCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueCrossinline.kt"); } @TestMetadata("defaultValueInClass.kt") @@ -3744,14 +3736,14 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInClass.kt"); } - @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") - public void testDefaultValueInlineFromMultiFileFacade_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInline.kt") + public void testDefaultValueInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt"); } - @TestMetadata("defaultValueInline.kt") - public void testDefaultValueInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInline.kt", "kotlin.coroutines"); + @TestMetadata("defaultValueInlineFromMultiFileFacade.kt") + public void testDefaultValueInlineFromMultiFileFacade() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/defaultParameter/defaultValueInlineFromMultiFileFacade.kt"); } } @@ -3809,52 +3801,48 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInReceiver() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/receiver"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("inlineOrdinaryOfCrossinlineSuspend.kt") - public void testInlineOrdinaryOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfCrossinlineSuspend.kt"); } @TestMetadata("inlineOrdinaryOfNoinlineSuspend.kt") - public void testInlineOrdinaryOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineOrdinaryOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineOrdinaryOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfCrossinlineOrdinary.kt") - public void testInlineSuspendOfCrossinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfCrossinlineSuspend.kt") - public void testInlineSuspendOfCrossinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfCrossinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfCrossinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfNoinlineOrdinary.kt") - public void testInlineSuspendOfNoinlineOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineOrdinary.kt"); } @TestMetadata("inlineSuspendOfNoinlineSuspend.kt") - public void testInlineSuspendOfNoinlineSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfNoinlineSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfNoinlineSuspend.kt"); } @TestMetadata("inlineSuspendOfOrdinary.kt") - public void testInlineSuspendOfOrdinary_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt", "kotlin.coroutines"); + public void testInlineSuspendOfOrdinary() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfOrdinary.kt"); } @TestMetadata("inlineSuspendOfSuspend.kt") - public void testInlineSuspendOfSuspend_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt", "kotlin.coroutines"); + public void testInlineSuspendOfSuspend() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/receiver/inlineSuspendOfSuspend.kt"); } } @@ -3866,77 +3854,73 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.JS, testDataFilePath); - } - public void testAllFilesPresentInStateMachine() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline/suspend/stateMachine"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } @TestMetadata("crossingCoroutineBoundaries.kt") - public void testCrossingCoroutineBoundaries_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt", "kotlin.coroutines"); + public void testCrossingCoroutineBoundaries() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/crossingCoroutineBoundaries.kt"); } @TestMetadata("independentInline.kt") - public void testIndependentInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaInsideLambda.kt") - public void testInnerLambdaInsideLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerLambdaWithoutCrossinline.kt") - public void testInnerLambdaWithoutCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt", "kotlin.coroutines"); + public void testIndependentInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/independentInline.kt"); } @TestMetadata("innerLambda.kt") - public void testInnerLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt", "kotlin.coroutines"); + public void testInnerLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambda.kt"); } - @TestMetadata("innerMadnessCallSite.kt") - public void testInnerMadnessCallSite_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt", "kotlin.coroutines"); + @TestMetadata("innerLambdaInsideLambda.kt") + public void testInnerLambdaInsideLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaInsideLambda.kt"); + } + + @TestMetadata("innerLambdaWithoutCrossinline.kt") + public void testInnerLambdaWithoutCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerLambdaWithoutCrossinline.kt"); } @TestMetadata("innerMadness.kt") - public void testInnerMadness_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt", "kotlin.coroutines"); + public void testInnerMadness() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadness.kt"); } - @TestMetadata("innerObjectInsideInnerObject.kt") - public void testInnerObjectInsideInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectRetransformation.kt") - public void testInnerObjectRetransformation_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectSeveralFunctions.kt") - public void testInnerObjectSeveralFunctions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt", "kotlin.coroutines"); - } - - @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") - public void testInnerObjectWithoutCapturingCrossinline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt", "kotlin.coroutines"); + @TestMetadata("innerMadnessCallSite.kt") + public void testInnerMadnessCallSite() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerMadnessCallSite.kt"); } @TestMetadata("innerObject.kt") - public void testInnerObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt", "kotlin.coroutines"); + public void testInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObject.kt"); + } + + @TestMetadata("innerObjectInsideInnerObject.kt") + public void testInnerObjectInsideInnerObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectInsideInnerObject.kt"); + } + + @TestMetadata("innerObjectRetransformation.kt") + public void testInnerObjectRetransformation() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.kt"); + } + + @TestMetadata("innerObjectSeveralFunctions.kt") + public void testInnerObjectSeveralFunctions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectSeveralFunctions.kt"); + } + + @TestMetadata("innerObjectWithoutCapturingCrossinline.kt") + public void testInnerObjectWithoutCapturingCrossinline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectWithoutCapturingCrossinline.kt"); } @TestMetadata("insideObject.kt") - public void testInsideObject_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt", "kotlin.coroutines"); + public void testInsideObject() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/insideObject.kt"); } @TestMetadata("lambdaTransformation.kt") @@ -3945,43 +3929,43 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { } @TestMetadata("normalInline.kt") - public void testNormalInline_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt", "kotlin.coroutines"); + public void testNormalInline() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/normalInline.kt"); } @TestMetadata("numberOfSuspentions.kt") - public void testNumberOfSuspentions_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt", "kotlin.coroutines"); + public void testNumberOfSuspentions() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/numberOfSuspentions.kt"); } @TestMetadata("objectInsideLambdas.kt") - public void testObjectInsideLambdas_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt", "kotlin.coroutines"); + public void testObjectInsideLambdas() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/objectInsideLambdas.kt"); } @TestMetadata("oneInlineTwoCaptures.kt") - public void testOneInlineTwoCaptures_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt", "kotlin.coroutines"); + public void testOneInlineTwoCaptures() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/oneInlineTwoCaptures.kt"); } @TestMetadata("passLambda.kt") - public void testPassLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt", "kotlin.coroutines"); - } - - @TestMetadata("passParameterLambda.kt") - public void testPassParameterLambda_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt", "kotlin.coroutines"); + public void testPassLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passLambda.kt"); } @TestMetadata("passParameter.kt") - public void testPassParameter_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt", "kotlin.coroutines"); + public void testPassParameter() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameter.kt"); + } + + @TestMetadata("passParameterLambda.kt") + public void testPassParameterLambda() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/passParameterLambda.kt"); } @TestMetadata("unreachableSuspendMarker.kt") - public void testUnreachableSuspendMarker_1_3() throws Exception { - runTestWithPackageReplacement("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt", "kotlin.coroutines"); + public void testUnreachableSuspendMarker() throws Exception { + runTest("compiler/testData/codegen/boxInline/suspend/stateMachine/unreachableSuspendMarker.kt"); } } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index 20538c6806f..99bde8de4b9 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -594,10 +594,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.WASM, testDataFilePath); - } - public void testAllFilesPresentInJvm() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/assert/jvm"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); } @@ -2861,10 +2857,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath); } - private void runTestWithPackageReplacement(String testDataFilePath, String packageName) throws Exception { - KotlinTestUtils.runTest0(filePath -> doTestWithCoroutinesPackageReplacement(filePath, packageName), TargetBackend.WASM, testDataFilePath); - } - public void testAllFilesPresentInCapturedVarsOptimization() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/closures/capturedVarsOptimization"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); }