From 60b950b9bdff284cf5c541c6d793d323de162da0 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 15 Aug 2023 14:47:24 +0200 Subject: [PATCH] [KLIB][tests] Keep "klib evolution" test data under "testData/klib/" dir --- .../evolution}/addAbstractMemberBody.kt | 0 .../evolution}/addCompanionObject.kt | 0 .../evolution}/addDefaultImplementations.kt | 0 .../evolution}/addEnumClassMember.kt | 0 .../evolution}/addLateinitToVar.kt | 0 .../evolution}/addOpenToClass.kt | 0 .../evolution}/addOpenToMember.kt | 0 .../evolution}/addOrRemoveConst.kt | 0 .../evolution}/addOrRemoveInitBlock.kt | 0 .../evolution}/addOverloads.kt | 0 .../evolution}/addParameterDefaulValue.kt | 0 .../evolution}/addPropertyAccessor.kt | 0 .../evolution}/addingSealedClassMember.kt | 0 .../evolution}/changeBaseClassOrder.kt | 0 .../changeCompanionToNestedObject.kt | 0 .../evolution}/changeConstInitialization.kt | 0 .../evolution}/changeNamesOfTypeParameters.kt | 0 .../evolution}/changeObjectToCompanion.kt | 0 .../evolution}/changeParameterDefaultValue.kt | 0 .../evolution}/changePropertyFromValToVar.kt | 0 .../changePropertyInitialization.kt | 0 .../constructorParameterMarkValVar.kt | 0 .../evolution}/deleteOverrideMember.kt | 0 .../evolution}/deletePrivateMembers.kt | 0 .../evolution}/inlineBodyChange.kt | 0 .../evolution}/inlineFunction.kt | 0 .../evolution}/makeFunctionInfixOrTailrec.kt | 0 .../evolution}/moreSpecificBaseClass.kt | 0 .../evolution}/moveMemberUpInHierarchy.kt | 0 .../evolution}/newFakeOverride.kt | 0 .../evolution}/newOverrideMember.kt | 0 .../evolution}/removeAbstractFromClass.kt | 0 .../removeInfixOrTailrecFromFunction.kt | 0 .../evolution}/removeLateinitFromVar.kt | 0 .../evolution}/removePropertyAccessor.kt | 0 .../evolution}/renameArguments.kt | 0 .../evolution}/reorderClassConstructors.kt | 0 .../evolution}/turnClassIntoDataClass.kt | 0 .../evolution}/widenSuperMemberVisibility.kt | 0 .../generators/tests/GenerateJsTests.kt | 6 +- .../klib/AbstractJsKlibEvolutionTest.kt | 1 - .../ClassicJsKlibEvolutionTestGenerated.java | 84 +++++++++---------- .../klib/FirJsKlibEvolutionTestGenerated.java | 84 +++++++++---------- .../FirNativeKlibEvolutionTestGenerated.java | 84 +++++++++---------- .../NativeKlibEvolutionTestGenerated.java | 84 +++++++++---------- .../generators/tests/GenerateNativeTests.kt | 4 +- 46 files changed, 173 insertions(+), 174 deletions(-) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addAbstractMemberBody.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addCompanionObject.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addDefaultImplementations.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addEnumClassMember.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addLateinitToVar.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addOpenToClass.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addOpenToMember.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addOrRemoveConst.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addOrRemoveInitBlock.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addOverloads.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addParameterDefaulValue.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addPropertyAccessor.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/addingSealedClassMember.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changeBaseClassOrder.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changeCompanionToNestedObject.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changeConstInitialization.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changeNamesOfTypeParameters.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changeObjectToCompanion.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changeParameterDefaultValue.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changePropertyFromValToVar.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/changePropertyInitialization.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/constructorParameterMarkValVar.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/deleteOverrideMember.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/deletePrivateMembers.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/inlineBodyChange.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/inlineFunction.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/makeFunctionInfixOrTailrec.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/moreSpecificBaseClass.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/moveMemberUpInHierarchy.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/newFakeOverride.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/newOverrideMember.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/removeAbstractFromClass.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/removeInfixOrTailrecFromFunction.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/removeLateinitFromVar.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/removePropertyAccessor.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/renameArguments.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/reorderClassConstructors.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/turnClassIntoDataClass.kt (100%) rename compiler/testData/{binaryCompatibility/klibEvolution => klib/evolution}/widenSuperMemberVisibility.kt (100%) diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt b/compiler/testData/klib/evolution/addAbstractMemberBody.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt rename to compiler/testData/klib/evolution/addAbstractMemberBody.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt b/compiler/testData/klib/evolution/addCompanionObject.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt rename to compiler/testData/klib/evolution/addCompanionObject.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt b/compiler/testData/klib/evolution/addDefaultImplementations.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt rename to compiler/testData/klib/evolution/addDefaultImplementations.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt b/compiler/testData/klib/evolution/addEnumClassMember.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt rename to compiler/testData/klib/evolution/addEnumClassMember.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt b/compiler/testData/klib/evolution/addLateinitToVar.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt rename to compiler/testData/klib/evolution/addLateinitToVar.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt b/compiler/testData/klib/evolution/addOpenToClass.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt rename to compiler/testData/klib/evolution/addOpenToClass.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt b/compiler/testData/klib/evolution/addOpenToMember.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt rename to compiler/testData/klib/evolution/addOpenToMember.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt b/compiler/testData/klib/evolution/addOrRemoveConst.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt rename to compiler/testData/klib/evolution/addOrRemoveConst.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt b/compiler/testData/klib/evolution/addOrRemoveInitBlock.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt rename to compiler/testData/klib/evolution/addOrRemoveInitBlock.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt b/compiler/testData/klib/evolution/addOverloads.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt rename to compiler/testData/klib/evolution/addOverloads.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt b/compiler/testData/klib/evolution/addParameterDefaulValue.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt rename to compiler/testData/klib/evolution/addParameterDefaulValue.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt b/compiler/testData/klib/evolution/addPropertyAccessor.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt rename to compiler/testData/klib/evolution/addPropertyAccessor.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt b/compiler/testData/klib/evolution/addingSealedClassMember.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt rename to compiler/testData/klib/evolution/addingSealedClassMember.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt b/compiler/testData/klib/evolution/changeBaseClassOrder.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt rename to compiler/testData/klib/evolution/changeBaseClassOrder.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt b/compiler/testData/klib/evolution/changeCompanionToNestedObject.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt rename to compiler/testData/klib/evolution/changeCompanionToNestedObject.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt b/compiler/testData/klib/evolution/changeConstInitialization.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt rename to compiler/testData/klib/evolution/changeConstInitialization.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt b/compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt rename to compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt b/compiler/testData/klib/evolution/changeObjectToCompanion.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt rename to compiler/testData/klib/evolution/changeObjectToCompanion.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt b/compiler/testData/klib/evolution/changeParameterDefaultValue.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt rename to compiler/testData/klib/evolution/changeParameterDefaultValue.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt b/compiler/testData/klib/evolution/changePropertyFromValToVar.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt rename to compiler/testData/klib/evolution/changePropertyFromValToVar.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt b/compiler/testData/klib/evolution/changePropertyInitialization.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt rename to compiler/testData/klib/evolution/changePropertyInitialization.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt b/compiler/testData/klib/evolution/constructorParameterMarkValVar.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt rename to compiler/testData/klib/evolution/constructorParameterMarkValVar.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt b/compiler/testData/klib/evolution/deleteOverrideMember.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt rename to compiler/testData/klib/evolution/deleteOverrideMember.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt b/compiler/testData/klib/evolution/deletePrivateMembers.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt rename to compiler/testData/klib/evolution/deletePrivateMembers.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt b/compiler/testData/klib/evolution/inlineBodyChange.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt rename to compiler/testData/klib/evolution/inlineBodyChange.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt b/compiler/testData/klib/evolution/inlineFunction.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt rename to compiler/testData/klib/evolution/inlineFunction.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt b/compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt rename to compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt b/compiler/testData/klib/evolution/moreSpecificBaseClass.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt rename to compiler/testData/klib/evolution/moreSpecificBaseClass.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt b/compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt rename to compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt b/compiler/testData/klib/evolution/newFakeOverride.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt rename to compiler/testData/klib/evolution/newFakeOverride.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt b/compiler/testData/klib/evolution/newOverrideMember.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt rename to compiler/testData/klib/evolution/newOverrideMember.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt b/compiler/testData/klib/evolution/removeAbstractFromClass.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt rename to compiler/testData/klib/evolution/removeAbstractFromClass.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt b/compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt rename to compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt b/compiler/testData/klib/evolution/removeLateinitFromVar.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt rename to compiler/testData/klib/evolution/removeLateinitFromVar.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt b/compiler/testData/klib/evolution/removePropertyAccessor.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt rename to compiler/testData/klib/evolution/removePropertyAccessor.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt b/compiler/testData/klib/evolution/renameArguments.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt rename to compiler/testData/klib/evolution/renameArguments.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt b/compiler/testData/klib/evolution/reorderClassConstructors.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt rename to compiler/testData/klib/evolution/reorderClassConstructors.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt b/compiler/testData/klib/evolution/turnClassIntoDataClass.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt rename to compiler/testData/klib/evolution/turnClassIntoDataClass.kt diff --git a/compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt b/compiler/testData/klib/evolution/widenSuperMemberVisibility.kt similarity index 100% rename from compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt rename to compiler/testData/klib/evolution/widenSuperMemberVisibility.kt diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index a617a73bd50..6be9354ea4b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -37,12 +37,12 @@ fun main(args: Array) { } } - testGroup("js/js.tests/tests-gen", "compiler/testData/binaryCompatibility", testRunnerMethodName = "runTest0") { + testGroup("js/js.tests/tests-gen", "compiler/testData", testRunnerMethodName = "runTest0") { testClass { - model("klibEvolution", targetBackend = TargetBackend.JS_IR) + model("klib/evolution", targetBackend = TargetBackend.JS_IR) } testClass { - model("klibEvolution", targetBackend = TargetBackend.JS_IR) + model("klib/evolution", targetBackend = TargetBackend.JS_IR) } } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt index ae0368d1a4b..9fd049366cb 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.js.testOld.V8JsTestChecker -import org.jetbrains.kotlin.js.testOld.klib.AbstractJsKlibEvolutionTest.Companion.klib import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION import org.jetbrains.kotlin.test.Directives import org.jetbrains.kotlin.test.KotlinBaseTest diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/ClassicJsKlibEvolutionTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/ClassicJsKlibEvolutionTestGenerated.java index 4bd66bc6853..0c6e7c169e2 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/ClassicJsKlibEvolutionTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/ClassicJsKlibEvolutionTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution") +@TestMetadata("compiler/testData/klib/evolution") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class ClassicJsKlibEvolutionTestGenerated extends AbstractClassicJsKlibEvolutionTest { @@ -28,200 +28,200 @@ public class ClassicJsKlibEvolutionTestGenerated extends AbstractClassicJsKlibEv @TestMetadata("addAbstractMemberBody.kt") public void testAddAbstractMemberBody() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt"); + runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt"); } @TestMetadata("addCompanionObject.kt") public void testAddCompanionObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt"); + runTest("compiler/testData/klib/evolution/addCompanionObject.kt"); } @TestMetadata("addDefaultImplementations.kt") public void testAddDefaultImplementations() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt"); + runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt"); } @TestMetadata("addEnumClassMember.kt") public void testAddEnumClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt"); + runTest("compiler/testData/klib/evolution/addEnumClassMember.kt"); } @TestMetadata("addLateinitToVar.kt") public void testAddLateinitToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt"); + runTest("compiler/testData/klib/evolution/addLateinitToVar.kt"); } @TestMetadata("addOpenToClass.kt") public void testAddOpenToClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt"); + runTest("compiler/testData/klib/evolution/addOpenToClass.kt"); } @TestMetadata("addOpenToMember.kt") public void testAddOpenToMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt"); + runTest("compiler/testData/klib/evolution/addOpenToMember.kt"); } @TestMetadata("addOrRemoveConst.kt") public void testAddOrRemoveConst() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt"); } @TestMetadata("addOrRemoveInitBlock.kt") public void testAddOrRemoveInitBlock() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt"); } @TestMetadata("addOverloads.kt") public void testAddOverloads() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt"); + runTest("compiler/testData/klib/evolution/addOverloads.kt"); } @TestMetadata("addParameterDefaulValue.kt") public void testAddParameterDefaulValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt"); + runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt"); } @TestMetadata("addPropertyAccessor.kt") public void testAddPropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt"); } @TestMetadata("addingSealedClassMember.kt") public void testAddingSealedClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt"); + runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt"); } - public void testAllFilesPresentInKlibEvolution() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + public void testAllFilesPresentInEvolution() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("changeBaseClassOrder.kt") public void testChangeBaseClassOrder() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt"); + runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt"); } @TestMetadata("changeCompanionToNestedObject.kt") public void testChangeCompanionToNestedObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt"); + runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt"); } @TestMetadata("changeConstInitialization.kt") public void testChangeConstInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt"); + runTest("compiler/testData/klib/evolution/changeConstInitialization.kt"); } @TestMetadata("changeNamesOfTypeParameters.kt") public void testChangeNamesOfTypeParameters() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt"); + runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt"); } @TestMetadata("changeObjectToCompanion.kt") public void testChangeObjectToCompanion() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt"); + runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt"); } @TestMetadata("changeParameterDefaultValue.kt") public void testChangeParameterDefaultValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt"); + runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt"); } @TestMetadata("changePropertyFromValToVar.kt") public void testChangePropertyFromValToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt"); + runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt"); } @TestMetadata("changePropertyInitialization.kt") public void testChangePropertyInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt"); + runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt"); } @TestMetadata("constructorParameterMarkValVar.kt") public void testConstructorParameterMarkValVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt"); + runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt"); } @TestMetadata("deleteOverrideMember.kt") public void testDeleteOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt"); } @TestMetadata("deletePrivateMembers.kt") public void testDeletePrivateMembers() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt"); + runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt"); } @TestMetadata("inlineBodyChange.kt") public void testInlineBodyChange() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt"); + runTest("compiler/testData/klib/evolution/inlineBodyChange.kt"); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt"); + runTest("compiler/testData/klib/evolution/inlineFunction.kt"); } @TestMetadata("makeFunctionInfixOrTailrec.kt") public void testMakeFunctionInfixOrTailrec() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt"); + runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt"); } @TestMetadata("moreSpecificBaseClass.kt") public void testMoreSpecificBaseClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt"); + runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt"); } @TestMetadata("moveMemberUpInHierarchy.kt") public void testMoveMemberUpInHierarchy() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt"); + runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt"); } @TestMetadata("newFakeOverride.kt") public void testNewFakeOverride() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt"); + runTest("compiler/testData/klib/evolution/newFakeOverride.kt"); } @TestMetadata("newOverrideMember.kt") public void testNewOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/newOverrideMember.kt"); } @TestMetadata("removeAbstractFromClass.kt") public void testRemoveAbstractFromClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt"); + runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt"); } @TestMetadata("removeInfixOrTailrecFromFunction.kt") public void testRemoveInfixOrTailrecFromFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt"); + runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt"); } @TestMetadata("removeLateinitFromVar.kt") public void testRemoveLateinitFromVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt"); + runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt"); } @TestMetadata("removePropertyAccessor.kt") public void testRemovePropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt"); } @TestMetadata("renameArguments.kt") public void testRenameArguments() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt"); + runTest("compiler/testData/klib/evolution/renameArguments.kt"); } @TestMetadata("reorderClassConstructors.kt") public void testReorderClassConstructors() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt"); + runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt"); } @TestMetadata("turnClassIntoDataClass.kt") public void testTurnClassIntoDataClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt"); + runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt"); } @TestMetadata("widenSuperMemberVisibility.kt") public void testWidenSuperMemberVisibility() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt"); + runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt"); } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/FirJsKlibEvolutionTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/FirJsKlibEvolutionTestGenerated.java index a31498b07e4..0332dbe6e46 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/FirJsKlibEvolutionTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/FirJsKlibEvolutionTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution") +@TestMetadata("compiler/testData/klib/evolution") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class FirJsKlibEvolutionTestGenerated extends AbstractFirJsKlibEvolutionTest { @@ -28,200 +28,200 @@ public class FirJsKlibEvolutionTestGenerated extends AbstractFirJsKlibEvolutionT @TestMetadata("addAbstractMemberBody.kt") public void testAddAbstractMemberBody() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt"); + runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt"); } @TestMetadata("addCompanionObject.kt") public void testAddCompanionObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt"); + runTest("compiler/testData/klib/evolution/addCompanionObject.kt"); } @TestMetadata("addDefaultImplementations.kt") public void testAddDefaultImplementations() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt"); + runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt"); } @TestMetadata("addEnumClassMember.kt") public void testAddEnumClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt"); + runTest("compiler/testData/klib/evolution/addEnumClassMember.kt"); } @TestMetadata("addLateinitToVar.kt") public void testAddLateinitToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt"); + runTest("compiler/testData/klib/evolution/addLateinitToVar.kt"); } @TestMetadata("addOpenToClass.kt") public void testAddOpenToClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt"); + runTest("compiler/testData/klib/evolution/addOpenToClass.kt"); } @TestMetadata("addOpenToMember.kt") public void testAddOpenToMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt"); + runTest("compiler/testData/klib/evolution/addOpenToMember.kt"); } @TestMetadata("addOrRemoveConst.kt") public void testAddOrRemoveConst() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt"); } @TestMetadata("addOrRemoveInitBlock.kt") public void testAddOrRemoveInitBlock() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt"); } @TestMetadata("addOverloads.kt") public void testAddOverloads() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt"); + runTest("compiler/testData/klib/evolution/addOverloads.kt"); } @TestMetadata("addParameterDefaulValue.kt") public void testAddParameterDefaulValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt"); + runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt"); } @TestMetadata("addPropertyAccessor.kt") public void testAddPropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt"); } @TestMetadata("addingSealedClassMember.kt") public void testAddingSealedClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt"); + runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt"); } - public void testAllFilesPresentInKlibEvolution() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); + public void testAllFilesPresentInEvolution() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @TestMetadata("changeBaseClassOrder.kt") public void testChangeBaseClassOrder() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt"); + runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt"); } @TestMetadata("changeCompanionToNestedObject.kt") public void testChangeCompanionToNestedObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt"); + runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt"); } @TestMetadata("changeConstInitialization.kt") public void testChangeConstInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt"); + runTest("compiler/testData/klib/evolution/changeConstInitialization.kt"); } @TestMetadata("changeNamesOfTypeParameters.kt") public void testChangeNamesOfTypeParameters() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt"); + runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt"); } @TestMetadata("changeObjectToCompanion.kt") public void testChangeObjectToCompanion() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt"); + runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt"); } @TestMetadata("changeParameterDefaultValue.kt") public void testChangeParameterDefaultValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt"); + runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt"); } @TestMetadata("changePropertyFromValToVar.kt") public void testChangePropertyFromValToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt"); + runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt"); } @TestMetadata("changePropertyInitialization.kt") public void testChangePropertyInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt"); + runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt"); } @TestMetadata("constructorParameterMarkValVar.kt") public void testConstructorParameterMarkValVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt"); + runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt"); } @TestMetadata("deleteOverrideMember.kt") public void testDeleteOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt"); } @TestMetadata("deletePrivateMembers.kt") public void testDeletePrivateMembers() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt"); + runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt"); } @TestMetadata("inlineBodyChange.kt") public void testInlineBodyChange() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt"); + runTest("compiler/testData/klib/evolution/inlineBodyChange.kt"); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt"); + runTest("compiler/testData/klib/evolution/inlineFunction.kt"); } @TestMetadata("makeFunctionInfixOrTailrec.kt") public void testMakeFunctionInfixOrTailrec() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt"); + runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt"); } @TestMetadata("moreSpecificBaseClass.kt") public void testMoreSpecificBaseClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt"); + runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt"); } @TestMetadata("moveMemberUpInHierarchy.kt") public void testMoveMemberUpInHierarchy() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt"); + runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt"); } @TestMetadata("newFakeOverride.kt") public void testNewFakeOverride() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt"); + runTest("compiler/testData/klib/evolution/newFakeOverride.kt"); } @TestMetadata("newOverrideMember.kt") public void testNewOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/newOverrideMember.kt"); } @TestMetadata("removeAbstractFromClass.kt") public void testRemoveAbstractFromClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt"); + runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt"); } @TestMetadata("removeInfixOrTailrecFromFunction.kt") public void testRemoveInfixOrTailrecFromFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt"); + runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt"); } @TestMetadata("removeLateinitFromVar.kt") public void testRemoveLateinitFromVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt"); + runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt"); } @TestMetadata("removePropertyAccessor.kt") public void testRemovePropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt"); } @TestMetadata("renameArguments.kt") public void testRenameArguments() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt"); + runTest("compiler/testData/klib/evolution/renameArguments.kt"); } @TestMetadata("reorderClassConstructors.kt") public void testReorderClassConstructors() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt"); + runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt"); } @TestMetadata("turnClassIntoDataClass.kt") public void testTurnClassIntoDataClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt"); + runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt"); } @TestMetadata("widenSuperMemberVisibility.kt") public void testWidenSuperMemberVisibility() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt"); + runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt"); } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java index d7fc7c150d8..7a232833cae 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution") +@TestMetadata("compiler/testData/klib/evolution") @TestDataPath("$PROJECT_ROOT") @Tag("frontend-fir") @FirPipeline() @@ -26,239 +26,239 @@ public class FirNativeKlibEvolutionTestGenerated extends AbstractNativeKlibEvolu @Test @TestMetadata("addAbstractMemberBody.kt") public void testAddAbstractMemberBody() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt"); + runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt"); } @Test @TestMetadata("addCompanionObject.kt") public void testAddCompanionObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt"); + runTest("compiler/testData/klib/evolution/addCompanionObject.kt"); } @Test @TestMetadata("addDefaultImplementations.kt") public void testAddDefaultImplementations() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt"); + runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt"); } @Test @TestMetadata("addEnumClassMember.kt") public void testAddEnumClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt"); + runTest("compiler/testData/klib/evolution/addEnumClassMember.kt"); } @Test @TestMetadata("addLateinitToVar.kt") public void testAddLateinitToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt"); + runTest("compiler/testData/klib/evolution/addLateinitToVar.kt"); } @Test @TestMetadata("addOpenToClass.kt") public void testAddOpenToClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt"); + runTest("compiler/testData/klib/evolution/addOpenToClass.kt"); } @Test @TestMetadata("addOpenToMember.kt") public void testAddOpenToMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt"); + runTest("compiler/testData/klib/evolution/addOpenToMember.kt"); } @Test @TestMetadata("addOrRemoveConst.kt") public void testAddOrRemoveConst() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt"); } @Test @TestMetadata("addOrRemoveInitBlock.kt") public void testAddOrRemoveInitBlock() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt"); } @Test @TestMetadata("addOverloads.kt") public void testAddOverloads() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt"); + runTest("compiler/testData/klib/evolution/addOverloads.kt"); } @Test @TestMetadata("addParameterDefaulValue.kt") public void testAddParameterDefaulValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt"); + runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt"); } @Test @TestMetadata("addPropertyAccessor.kt") public void testAddPropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt"); } @Test @TestMetadata("addingSealedClassMember.kt") public void testAddingSealedClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt"); + runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt"); } @Test - public void testAllFilesPresentInKlibEvolution() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, false); + public void testAllFilesPresentInEvolution() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, false); } @Test @TestMetadata("changeBaseClassOrder.kt") public void testChangeBaseClassOrder() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt"); + runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt"); } @Test @TestMetadata("changeCompanionToNestedObject.kt") public void testChangeCompanionToNestedObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt"); + runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt"); } @Test @TestMetadata("changeConstInitialization.kt") public void testChangeConstInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt"); + runTest("compiler/testData/klib/evolution/changeConstInitialization.kt"); } @Test @TestMetadata("changeNamesOfTypeParameters.kt") public void testChangeNamesOfTypeParameters() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt"); + runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt"); } @Test @TestMetadata("changeObjectToCompanion.kt") public void testChangeObjectToCompanion() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt"); + runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt"); } @Test @TestMetadata("changeParameterDefaultValue.kt") public void testChangeParameterDefaultValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt"); + runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt"); } @Test @TestMetadata("changePropertyFromValToVar.kt") public void testChangePropertyFromValToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt"); + runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt"); } @Test @TestMetadata("changePropertyInitialization.kt") public void testChangePropertyInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt"); + runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt"); } @Test @TestMetadata("constructorParameterMarkValVar.kt") public void testConstructorParameterMarkValVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt"); + runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt"); } @Test @TestMetadata("deleteOverrideMember.kt") public void testDeleteOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt"); } @Test @TestMetadata("deletePrivateMembers.kt") public void testDeletePrivateMembers() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt"); + runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt"); } @Test @TestMetadata("inlineBodyChange.kt") public void testInlineBodyChange() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt"); + runTest("compiler/testData/klib/evolution/inlineBodyChange.kt"); } @Test @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt"); + runTest("compiler/testData/klib/evolution/inlineFunction.kt"); } @Test @TestMetadata("makeFunctionInfixOrTailrec.kt") public void testMakeFunctionInfixOrTailrec() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt"); + runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt"); } @Test @TestMetadata("moreSpecificBaseClass.kt") public void testMoreSpecificBaseClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt"); + runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt"); } @Test @TestMetadata("moveMemberUpInHierarchy.kt") public void testMoveMemberUpInHierarchy() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt"); + runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt"); } @Test @TestMetadata("newFakeOverride.kt") public void testNewFakeOverride() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt"); + runTest("compiler/testData/klib/evolution/newFakeOverride.kt"); } @Test @TestMetadata("newOverrideMember.kt") public void testNewOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/newOverrideMember.kt"); } @Test @TestMetadata("removeAbstractFromClass.kt") public void testRemoveAbstractFromClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt"); + runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt"); } @Test @TestMetadata("removeInfixOrTailrecFromFunction.kt") public void testRemoveInfixOrTailrecFromFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt"); + runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt"); } @Test @TestMetadata("removeLateinitFromVar.kt") public void testRemoveLateinitFromVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt"); + runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt"); } @Test @TestMetadata("removePropertyAccessor.kt") public void testRemovePropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt"); } @Test @TestMetadata("renameArguments.kt") public void testRenameArguments() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt"); + runTest("compiler/testData/klib/evolution/renameArguments.kt"); } @Test @TestMetadata("reorderClassConstructors.kt") public void testReorderClassConstructors() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt"); + runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt"); } @Test @TestMetadata("turnClassIntoDataClass.kt") public void testTurnClassIntoDataClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt"); + runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt"); } @Test @TestMetadata("widenSuperMemberVisibility.kt") public void testWidenSuperMemberVisibility() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt"); + runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt"); } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java index 8eb0f1b414b..0df6223deec 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java @@ -16,245 +16,245 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution") +@TestMetadata("compiler/testData/klib/evolution") @TestDataPath("$PROJECT_ROOT") public class NativeKlibEvolutionTestGenerated extends AbstractNativeKlibEvolutionTest { @Test @TestMetadata("addAbstractMemberBody.kt") public void testAddAbstractMemberBody() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt"); + runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt"); } @Test @TestMetadata("addCompanionObject.kt") public void testAddCompanionObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt"); + runTest("compiler/testData/klib/evolution/addCompanionObject.kt"); } @Test @TestMetadata("addDefaultImplementations.kt") public void testAddDefaultImplementations() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt"); + runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt"); } @Test @TestMetadata("addEnumClassMember.kt") public void testAddEnumClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt"); + runTest("compiler/testData/klib/evolution/addEnumClassMember.kt"); } @Test @TestMetadata("addLateinitToVar.kt") public void testAddLateinitToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt"); + runTest("compiler/testData/klib/evolution/addLateinitToVar.kt"); } @Test @TestMetadata("addOpenToClass.kt") public void testAddOpenToClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt"); + runTest("compiler/testData/klib/evolution/addOpenToClass.kt"); } @Test @TestMetadata("addOpenToMember.kt") public void testAddOpenToMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt"); + runTest("compiler/testData/klib/evolution/addOpenToMember.kt"); } @Test @TestMetadata("addOrRemoveConst.kt") public void testAddOrRemoveConst() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt"); } @Test @TestMetadata("addOrRemoveInitBlock.kt") public void testAddOrRemoveInitBlock() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt"); + runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt"); } @Test @TestMetadata("addOverloads.kt") public void testAddOverloads() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt"); + runTest("compiler/testData/klib/evolution/addOverloads.kt"); } @Test @TestMetadata("addParameterDefaulValue.kt") public void testAddParameterDefaulValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt"); + runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt"); } @Test @TestMetadata("addPropertyAccessor.kt") public void testAddPropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt"); } @Test @TestMetadata("addingSealedClassMember.kt") public void testAddingSealedClassMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt"); + runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt"); } @Test - public void testAllFilesPresentInKlibEvolution() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, false); + public void testAllFilesPresentInEvolution() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, false); } @Test @TestMetadata("changeBaseClassOrder.kt") public void testChangeBaseClassOrder() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt"); + runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt"); } @Test @TestMetadata("changeCompanionToNestedObject.kt") public void testChangeCompanionToNestedObject() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt"); + runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt"); } @Test @TestMetadata("changeConstInitialization.kt") public void testChangeConstInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt"); + runTest("compiler/testData/klib/evolution/changeConstInitialization.kt"); } @Test @TestMetadata("changeNamesOfTypeParameters.kt") public void testChangeNamesOfTypeParameters() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt"); + runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt"); } @Test @TestMetadata("changeObjectToCompanion.kt") public void testChangeObjectToCompanion() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt"); + runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt"); } @Test @TestMetadata("changeParameterDefaultValue.kt") public void testChangeParameterDefaultValue() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt"); + runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt"); } @Test @TestMetadata("changePropertyFromValToVar.kt") public void testChangePropertyFromValToVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt"); + runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt"); } @Test @TestMetadata("changePropertyInitialization.kt") public void testChangePropertyInitialization() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt"); + runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt"); } @Test @TestMetadata("constructorParameterMarkValVar.kt") public void testConstructorParameterMarkValVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt"); + runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt"); } @Test @TestMetadata("deleteOverrideMember.kt") public void testDeleteOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt"); } @Test @TestMetadata("deletePrivateMembers.kt") public void testDeletePrivateMembers() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt"); + runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt"); } @Test @TestMetadata("inlineBodyChange.kt") public void testInlineBodyChange() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt"); + runTest("compiler/testData/klib/evolution/inlineBodyChange.kt"); } @Test @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt"); + runTest("compiler/testData/klib/evolution/inlineFunction.kt"); } @Test @TestMetadata("makeFunctionInfixOrTailrec.kt") public void testMakeFunctionInfixOrTailrec() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt"); + runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt"); } @Test @TestMetadata("moreSpecificBaseClass.kt") public void testMoreSpecificBaseClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt"); + runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt"); } @Test @TestMetadata("moveMemberUpInHierarchy.kt") public void testMoveMemberUpInHierarchy() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt"); + runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt"); } @Test @TestMetadata("newFakeOverride.kt") public void testNewFakeOverride() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt"); + runTest("compiler/testData/klib/evolution/newFakeOverride.kt"); } @Test @TestMetadata("newOverrideMember.kt") public void testNewOverrideMember() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt"); + runTest("compiler/testData/klib/evolution/newOverrideMember.kt"); } @Test @TestMetadata("removeAbstractFromClass.kt") public void testRemoveAbstractFromClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt"); + runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt"); } @Test @TestMetadata("removeInfixOrTailrecFromFunction.kt") public void testRemoveInfixOrTailrecFromFunction() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt"); + runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt"); } @Test @TestMetadata("removeLateinitFromVar.kt") public void testRemoveLateinitFromVar() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt"); + runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt"); } @Test @TestMetadata("removePropertyAccessor.kt") public void testRemovePropertyAccessor() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt"); + runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt"); } @Test @TestMetadata("renameArguments.kt") public void testRenameArguments() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt"); + runTest("compiler/testData/klib/evolution/renameArguments.kt"); } @Test @TestMetadata("reorderClassConstructors.kt") public void testReorderClassConstructors() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt"); + runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt"); } @Test @TestMetadata("turnClassIntoDataClass.kt") public void testTurnClassIntoDataClass() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt"); + runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt"); } @Test @TestMetadata("widenSuperMemberVisibility.kt") public void testWidenSuperMemberVisibility() throws Exception { - runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt"); + runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt"); } } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt index 508f510abac..1799d22e81f 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt @@ -128,7 +128,7 @@ fun main() { testClass( suiteTestClassName = "NativeKlibEvolutionTestGenerated" ) { - model("binaryCompatibility/klibEvolution", recursive = false) + model("klib/evolution", recursive = false) } testClass( suiteTestClassName = "FirNativeKlibEvolutionTestGenerated", @@ -136,7 +136,7 @@ fun main() { *frontendFir() ) ) { - model("binaryCompatibility/klibEvolution", recursive = false) + model("klib/evolution", recursive = false) } }