diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index e13368d374c..c9d7e8f5a27 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -151,26 +151,14 @@ fun main(args: Array) { testGroup("plugins/jvm-abi-gen/test", "plugins/jvm-abi-gen/testData") { testClass { - model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM) - } - - testClass { - model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM) - } - - testClass { - model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM) - } - - testClass { model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) } - testClass { + testClass { model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) } - testClass { + testClass { model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) } } @@ -181,15 +169,15 @@ fun main(args: Array) { additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_LEGACY: \"") ) { testClass { - model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM) + model("compare", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) } testClass { - model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM) + model("content", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) } testClass { - model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM) + model("compile", recursive = false, extension = null, targetBackend = TargetBackend.JVM_IR) } } diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrCompareJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrCompareJvmAbiTest.kt deleted file mode 100644 index 2bfbfa3b312..00000000000 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrCompareJvmAbiTest.kt +++ /dev/null @@ -1,14 +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.jvm.abi - -import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories -import java.io.File -import kotlin.test.assertFails - -abstract class AbstractIrCompareJvmAbiTest : AbstractCompareJvmAbiTest() { - override val useIrBackend = true -} diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrCompileAgainstJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrCompileAgainstJvmAbiTest.kt deleted file mode 100644 index ba0f3941eaf..00000000000 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrCompileAgainstJvmAbiTest.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.jetbrains.kotlin.jvm.abi - -import java.io.File -import java.net.URLClassLoader - -abstract class AbstractIrCompileAgainstJvmAbiTest : AbstractCompileAgainstJvmAbiTest() { - override val useIrBackend = true -} diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrJvmAbiContentTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrJvmAbiContentTest.kt deleted file mode 100644 index 630ecf29700..00000000000 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractIrJvmAbiContentTest.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.jetbrains.kotlin.jvm.abi - -abstract class AbstractIrJvmAbiContentTest : AbstractJvmAbiContentTest() { - override val useIrBackend = true -} diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt index c6bbd8f5624..83729ea90ae 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt @@ -15,13 +15,11 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.createTempDirectory abstract class BaseJvmAbiTest : TestCase() { private lateinit var workingDir: File - @OptIn(ExperimentalPathApi::class) override fun setUp() { super.setUp() workingDir = createTempDirectory(javaClass.simpleName).toFile().apply { deleteOnExit() } @@ -82,7 +80,6 @@ abstract class BaseJvmAbiTest : TestCase() { if (useLegacyAbiGen) abiOption("useLegacyAbiGen", "true") else null ).toTypedArray() destination = compilation.destinationDir.canonicalPath - useOldBackend = !useIrBackend noSourceDebugExtension = directives != null && InTextDirectivesUtils.findStringWithPrefixes(directives, "// NO_SOURCE_DEBUG_EXTENSION") != null } @@ -110,9 +107,6 @@ abstract class BaseJvmAbiTest : TestCase() { } } - protected open val useIrBackend: Boolean - get() = false - protected open val useLegacyAbiGen: Boolean get() = false diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompareJvmAbiTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompareJvmAbiTestGenerated.java index 1ca1c1378bb..303d4a52614 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompareJvmAbiTestGenerated.java +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompareJvmAbiTestGenerated.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompareJvmAbiTestGenerated extends AbstractCompareJvmAbiTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompare() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("anonymousObjects") diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompileAgainstJvmAbiTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompileAgainstJvmAbiTestGenerated.java index 8d5df41e1a3..74393528ec2 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompileAgainstJvmAbiTestGenerated.java +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/CompileAgainstJvmAbiTestGenerated.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompileAgainstJvmAbiTestGenerated extends AbstractCompileAgainstJvmAbiTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompile() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("anonymousObject") diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrCompareJvmAbiTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrCompareJvmAbiTestGenerated.java deleted file mode 100644 index 570f66fd9a3..00000000000 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrCompareJvmAbiTestGenerated.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright 2010-2022 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.jvm.abi; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("plugins/jvm-abi-gen/testData/compare") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class IrCompareJvmAbiTestGenerated extends AbstractIrCompareJvmAbiTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInCompare() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); - } - - @TestMetadata("anonymousObjects") - public void testAnonymousObjects() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/anonymousObjects/"); - } - - @TestMetadata("classFlags") - public void testClassFlags() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/classFlags/"); - } - - @TestMetadata("classPrivateMemebers") - public void testClassPrivateMemebers() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/classPrivateMemebers/"); - } - - @TestMetadata("clinit") - public void testClinit() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/clinit/"); - } - - @TestMetadata("constant") - public void testConstant() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/constant/"); - } - - @TestMetadata("declarationOrderInline") - public void testDeclarationOrderInline() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/declarationOrderInline/"); - } - - @TestMetadata("declarationOrderInlineCall") - public void testDeclarationOrderInlineCall() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/declarationOrderInlineCall/"); - } - - @TestMetadata("declarationOrderPrivateInline") - public void testDeclarationOrderPrivateInline() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/declarationOrderPrivateInline/"); - } - - @TestMetadata("functionBody") - public void testFunctionBody() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/functionBody/"); - } - - @TestMetadata("inlineFunInPrivateClass") - public void testInlineFunInPrivateClass() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateClass/"); - } - - @TestMetadata("inlineFunInPrivateNestedClass") - public void testInlineFunInPrivateNestedClass() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateNestedClass/"); - } - - @TestMetadata("inlineFunctionBody") - public void testInlineFunctionBody() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/inlineFunctionBody/"); - } - - @TestMetadata("lambdas") - public void testLambdas() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/lambdas/"); - } - - @TestMetadata("parameterName") - public void testParameterName() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/parameterName/"); - } - - @TestMetadata("privateTypealias") - public void testPrivateTypealias() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/privateTypealias/"); - } - - @TestMetadata("returnType") - public void testReturnType() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/returnType/"); - } - - @TestMetadata("superClass") - public void testSuperClass() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/superClass/"); - } - - @TestMetadata("syntheticAccessors") - public void testSyntheticAccessors() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/syntheticAccessors/"); - } - - @TestMetadata("topLevelPrivateMembers") - public void testTopLevelPrivateMembers() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compare/topLevelPrivateMembers/"); - } -} diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrCompileAgainstJvmAbiTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrCompileAgainstJvmAbiTestGenerated.java deleted file mode 100644 index 23a3a04c007..00000000000 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrCompileAgainstJvmAbiTestGenerated.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright 2010-2022 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.jvm.abi; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("plugins/jvm-abi-gen/testData/compile") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class IrCompileAgainstJvmAbiTestGenerated extends AbstractIrCompileAgainstJvmAbiTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInCompile() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); - } - - @TestMetadata("anonymousObject") - public void testAnonymousObject() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/anonymousObject/"); - } - - @TestMetadata("classes") - public void testClasses() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/classes/"); - } - - @TestMetadata("clinit") - public void testClinit() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/clinit/"); - } - - @TestMetadata("inlineAnnotationInstantiation") - public void testInlineAnnotationInstantiation() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/inlineAnnotationInstantiation/"); - } - - @TestMetadata("inlineAnonymousObject") - public void testInlineAnonymousObject() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/inlineAnonymousObject/"); - } - - @TestMetadata("inlineCapture") - public void testInlineCapture() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/inlineCapture/"); - } - - @TestMetadata("inlineNoRegeneration") - public void testInlineNoRegeneration() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/inlineNoRegeneration/"); - } - - @TestMetadata("inlineReifiedFunction") - public void testInlineReifiedFunction() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/inlineReifiedFunction/"); - } - - @TestMetadata("inlineWhenMappings") - public void testInlineWhenMappings() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/inlineWhenMappings/"); - } - - @TestMetadata("innerObjectRegeneration") - public void testInnerObjectRegeneration() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/innerObjectRegeneration/"); - } - - @TestMetadata("kt-40133") - public void testKt_40133() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/kt-40133/"); - } - - @TestMetadata("kt-40340") - public void testKt_40340() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/kt-40340/"); - } - - @TestMetadata("privateAnnotationsFromJavaApp") - public void testPrivateAnnotationsFromJavaApp() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/privateAnnotationsFromJavaApp/"); - } - - @TestMetadata("privateAnnotationsFromJavaLib") - public void testPrivateAnnotationsFromJavaLib() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/privateAnnotationsFromJavaLib/"); - } - - @TestMetadata("privateClassesFromJavaApp") - public void testPrivateClassesFromJavaApp() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/privateClassesFromJavaApp/"); - } - - @TestMetadata("privateClassesFromJavaLib") - public void testPrivateClassesFromJavaLib() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/privateClassesFromJavaLib/"); - } - - @TestMetadata("privateOnlyConstructors") - public void testPrivateOnlyConstructors() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/privateOnlyConstructors/"); - } - - @TestMetadata("privateValueClassConstructor") - public void testPrivateValueClassConstructor() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/privateValueClassConstructor/"); - } - - @TestMetadata("topLevel") - public void testTopLevel() throws Exception { - runTest("plugins/jvm-abi-gen/testData/compile/topLevel/"); - } -} diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrJvmAbiContentTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrJvmAbiContentTestGenerated.java deleted file mode 100644 index e6e1b9b27c7..00000000000 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/IrJvmAbiContentTestGenerated.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2010-2022 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.jvm.abi; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("plugins/jvm-abi-gen/testData/content") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class IrJvmAbiContentTestGenerated extends AbstractIrJvmAbiContentTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); - } - - public void testAllFilesPresentInContent() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); - } - - @TestMetadata("annotation") - public void testAnnotation() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/annotation/"); - } - - @TestMetadata("annotationInstantiation") - public void testAnnotationInstantiation() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/annotationInstantiation/"); - } - - @TestMetadata("anonymousAnnotationInstantiation") - public void testAnonymousAnnotationInstantiation() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/anonymousAnnotationInstantiation/"); - } - - @TestMetadata("anonymousWhenMapping") - public void testAnonymousWhenMapping() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/"); - } - - @TestMetadata("class") - public void testClass() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/class/"); - } - - @TestMetadata("kt50005") - public void testKt50005() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/kt50005/"); - } - - @TestMetadata("whenMapping") - public void testWhenMapping() throws Exception { - runTest("plugins/jvm-abi-gen/testData/content/whenMapping/"); - } -} diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/JvmAbiContentTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/JvmAbiContentTestGenerated.java index f0926710615..a2c99866b46 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/JvmAbiContentTestGenerated.java +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/JvmAbiContentTestGenerated.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JvmAbiContentTestGenerated extends AbstractJvmAbiContentTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInContent() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("annotation") diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompareJvmAbiTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompareJvmAbiTestGenerated.java index bfd7eb81c0b..8fb5aab4770 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompareJvmAbiTestGenerated.java +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompareJvmAbiTestGenerated.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LegacyCompareJvmAbiTestGenerated extends AbstractLegacyCompareJvmAbiTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); + KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); } public void testAllFilesPresentInCompare() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compare"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("anonymousObjects") diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompileAgainstJvmAbiTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompileAgainstJvmAbiTestGenerated.java index 13cb0a9afc3..85f4aacecb3 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompileAgainstJvmAbiTestGenerated.java +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyCompileAgainstJvmAbiTestGenerated.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LegacyCompileAgainstJvmAbiTestGenerated extends AbstractLegacyCompileAgainstJvmAbiTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); + KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); } public void testAllFilesPresentInCompile() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/compile"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("anonymousObject") diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyJvmAbiContentTestGenerated.java b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyJvmAbiContentTestGenerated.java index 0e798841ea8..7c9cc65f226 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyJvmAbiContentTestGenerated.java +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/LegacyJvmAbiContentTestGenerated.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LegacyJvmAbiContentTestGenerated extends AbstractLegacyJvmAbiContentTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); + KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_LEGACY: "); } public void testAllFilesPresentInContent() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jvm-abi-gen/testData/content"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("annotation") diff --git a/plugins/jvm-abi-gen/testData/compare/anonymousObjects/directives.txt b/plugins/jvm-abi-gen/testData/compare/anonymousObjects/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compare/anonymousObjects/directives.txt +++ b/plugins/jvm-abi-gen/testData/compare/anonymousObjects/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compare/declarationOrderInlineCall/directives.txt b/plugins/jvm-abi-gen/testData/compare/declarationOrderInlineCall/directives.txt index ea0fd1d7526..ce9e2b7603a 100644 --- a/plugins/jvm-abi-gen/testData/compare/declarationOrderInlineCall/directives.txt +++ b/plugins/jvm-abi-gen/testData/compare/declarationOrderInlineCall/directives.txt @@ -1,2 +1,2 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM, JVM_IR \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR +// IGNORE_BACKEND: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compare/declarationOrderPrivateInline/directives.txt b/plugins/jvm-abi-gen/testData/compare/declarationOrderPrivateInline/directives.txt index ccc89f0cbd1..b0d6c0cb1c6 100644 --- a/plugins/jvm-abi-gen/testData/compare/declarationOrderPrivateInline/directives.txt +++ b/plugins/jvm-abi-gen/testData/compare/declarationOrderPrivateInline/directives.txt @@ -1,2 +1,2 @@ -// IGNORE_BACKEND_LEGACY: JVM +// IGNORE_BACKEND_LEGACY: JVM_IR // NO_SOURCE_DEBUG_EXTENSION diff --git a/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateClass/directives.txt b/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateClass/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateClass/directives.txt +++ b/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateClass/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateNestedClass/directives.txt b/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateNestedClass/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateNestedClass/directives.txt +++ b/plugins/jvm-abi-gen/testData/compare/inlineFunInPrivateNestedClass/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compare/lambdas/directives.txt b/plugins/jvm-abi-gen/testData/compare/lambdas/directives.txt index ccc89f0cbd1..b0d6c0cb1c6 100644 --- a/plugins/jvm-abi-gen/testData/compare/lambdas/directives.txt +++ b/plugins/jvm-abi-gen/testData/compare/lambdas/directives.txt @@ -1,2 +1,2 @@ -// IGNORE_BACKEND_LEGACY: JVM +// IGNORE_BACKEND_LEGACY: JVM_IR // NO_SOURCE_DEBUG_EXTENSION diff --git a/plugins/jvm-abi-gen/testData/compile/inlineAnnotationInstantiation/directives.txt b/plugins/jvm-abi-gen/testData/compile/inlineAnnotationInstantiation/directives.txt index 93cabbf01f5..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compile/inlineAnnotationInstantiation/directives.txt +++ b/plugins/jvm-abi-gen/testData/compile/inlineAnnotationInstantiation/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compile/inlineWhenMappings/directives.txt b/plugins/jvm-abi-gen/testData/compile/inlineWhenMappings/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compile/inlineWhenMappings/directives.txt +++ b/plugins/jvm-abi-gen/testData/compile/inlineWhenMappings/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compile/innerObjectRegeneration/directives.txt b/plugins/jvm-abi-gen/testData/compile/innerObjectRegeneration/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compile/innerObjectRegeneration/directives.txt +++ b/plugins/jvm-abi-gen/testData/compile/innerObjectRegeneration/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compile/kt-40133/directives.txt b/plugins/jvm-abi-gen/testData/compile/kt-40133/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compile/kt-40133/directives.txt +++ b/plugins/jvm-abi-gen/testData/compile/kt-40133/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/compile/kt-40340/directives.txt b/plugins/jvm-abi-gen/testData/compile/kt-40340/directives.txt index 3f7eb8b3500..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/compile/kt-40340/directives.txt +++ b/plugins/jvm-abi-gen/testData/compile/kt-40340/directives.txt @@ -1 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/content/annotationInstantiation/directives.txt b/plugins/jvm-abi-gen/testData/content/annotationInstantiation/directives.txt index 93cabbf01f5..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/content/annotationInstantiation/directives.txt +++ b/plugins/jvm-abi-gen/testData/content/annotationInstantiation/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/content/anonymousAnnotationInstantiation/directives.txt b/plugins/jvm-abi-gen/testData/content/anonymousAnnotationInstantiation/directives.txt index 93cabbf01f5..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/content/anonymousAnnotationInstantiation/directives.txt +++ b/plugins/jvm-abi-gen/testData/content/anonymousAnnotationInstantiation/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/directives.txt b/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/directives.txt index e59cf931fc8..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/directives.txt +++ b/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/content/class/directives.txt b/plugins/jvm-abi-gen/testData/content/class/directives.txt index e59cf931fc8..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/content/class/directives.txt +++ b/plugins/jvm-abi-gen/testData/content/class/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/content/kt50005/directives.txt b/plugins/jvm-abi-gen/testData/content/kt50005/directives.txt index e59cf931fc8..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/content/kt50005/directives.txt +++ b/plugins/jvm-abi-gen/testData/content/kt50005/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR diff --git a/plugins/jvm-abi-gen/testData/content/whenMapping/directives.txt b/plugins/jvm-abi-gen/testData/content/whenMapping/directives.txt index e59cf931fc8..13ed9e2bf23 100644 --- a/plugins/jvm-abi-gen/testData/content/whenMapping/directives.txt +++ b/plugins/jvm-abi-gen/testData/content/whenMapping/directives.txt @@ -1,2 +1 @@ -// IGNORE_BACKEND_LEGACY: JVM -// IGNORE_BACKEND: JVM \ No newline at end of file +// IGNORE_BACKEND_LEGACY: JVM_IR