From 66bbb9582c839e54e30c43e10aaf5be087b2239d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 11 Jul 2023 13:31:05 +0200 Subject: [PATCH] K1/K2: split incremental compilation tests properly (relates to KT-59171) --- .../build.gradle.kts | 3 +- ...tractIncrementalK1JvmCompilerRunnerTest.kt | 21 ++ ...ractIncrementalK2JvmCompilerRunnerTest.kt} | 7 +- ...ntalK1JvmCompilerRunnerTestGenerated.java} | 214 +++++++++--------- ...ntalK2JvmCompilerRunnerTestGenerated.java} | 214 +++++++++--------- .../kotlin/generators/tests/GenerateTests.kt | 6 +- ...ithPluginCompilerRunnerTestGenerated.java} | 2 +- ...ractIncrementalFirJvmCompilerRunnerTest.kt | 2 +- 8 files changed, 247 insertions(+), 222 deletions(-) create mode 100644 compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JvmCompilerRunnerTest.kt rename compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/{AbstractIncrementalFirJvmCompilerRunnerTest.kt => AbstractIncrementalK2JvmCompilerRunnerTest.kt} (80%) rename compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/{IncrementalJvmCompilerRunnerTestGenerated.java => IncrementalK1JvmCompilerRunnerTestGenerated.java} (97%) rename compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/{IncrementalFirJvmCompilerRunnerTestGenerated.java => IncrementalK2JvmCompilerRunnerTestGenerated.java} (96%) rename plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/{IncrementalFirJvmWithPluginCompilerRunnerTestGenerated.java => IncrementalK2JvmWithPluginCompilerRunnerTestGenerated.java} (94%) diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index 7e2ea6ec437..3cc925bcf98 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -50,7 +50,8 @@ projectTest("testJvmICWithJdk11", parallel = true) { workingDir = rootDir useJsIrBoxTests(version = version, buildDir = "$buildDir/") filter { - includeTestsMatching("org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunnerTestGenerated*") + includeTestsMatching("org.jetbrains.kotlin.incremental.IncrementalK1JvmCompilerRunnerTestGenerated*") + includeTestsMatching("org.jetbrains.kotlin.incremental.IncrementalK2JvmCompilerRunnerTestGenerated*") } javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_11_0)) } diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JvmCompilerRunnerTest.kt new file mode 100644 index 00000000000..c98276e7e39 --- /dev/null +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JvmCompilerRunnerTest.kt @@ -0,0 +1,21 @@ +/* + * Copyright 2010-2023 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.incremental + +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.config.LanguageVersion +import java.io.File + +abstract class AbstractIncrementalK1JvmCompilerRunnerTest : AbstractIncrementalJvmCompilerRunnerTest() { + override fun createCompilerArguments(destinationDir: File, testDir: File): K2JVMCompilerArguments = + super.createCompilerArguments(destinationDir, testDir).apply { + useK2 = false + if (LanguageVersion.LATEST_STABLE >= LanguageVersion.KOTLIN_2_0) { + languageVersion = "1.9" + } + } + +} \ No newline at end of file diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK2JvmCompilerRunnerTest.kt similarity index 80% rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK2JvmCompilerRunnerTest.kt index d9b1eaa299a..a176cbb20fc 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK2JvmCompilerRunnerTest.kt @@ -17,14 +17,17 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder import java.io.File -abstract class AbstractIncrementalFirJvmCompilerRunnerTest : AbstractIncrementalJvmCompilerRunnerTest() { +abstract class AbstractIncrementalK2JvmCompilerRunnerTest : AbstractIncrementalJvmCompilerRunnerTest() { override fun createCompilerArguments(destinationDir: File, testDir: File): K2JVMCompilerArguments = super.createCompilerArguments(destinationDir, testDir).apply { useK2 = true - languageVersion = "2.0" + if (LanguageVersion.LATEST_STABLE < LanguageVersion.KOTLIN_2_0) { + languageVersion = "2.0" + } } override val buildLogFinder: BuildLogFinder diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JvmCompilerRunnerTestGenerated.java similarity index 97% rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JvmCompilerRunnerTestGenerated.java index 49bd2b4128c..4982fa8555f 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JvmCompilerRunnerTestGenerated.java @@ -19,11 +19,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrementalJvmCompilerRunnerTest { +public class IncrementalK1JvmCompilerRunnerTestGenerated extends AbstractIncrementalK1JvmCompilerRunnerTest { @TestMetadata("jps/jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PureKotlin extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PureKotlin extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -696,7 +696,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/classHierarchyAffected") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassHierarchyAffected extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ClassHierarchyAffected extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -914,7 +914,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunCallSite extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InlineFunCallSite extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1001,7 +1001,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassProperty extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ClassProperty extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1014,7 +1014,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectProperty extends AbstractIncrementalJvmCompilerRunnerTest { + public static class CompanionObjectProperty extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1027,7 +1027,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Coroutine extends AbstractIncrementalJvmCompilerRunnerTest { + public static class Coroutine extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1040,7 +1040,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Function extends AbstractIncrementalJvmCompilerRunnerTest { + public static class Function extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1053,7 +1053,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionIndirect extends AbstractIncrementalJvmCompilerRunnerTest { + public static class FunctionIndirect extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1066,7 +1066,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Getter extends AbstractIncrementalJvmCompilerRunnerTest { + public static class Getter extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1079,7 +1079,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Lambda extends AbstractIncrementalJvmCompilerRunnerTest { + public static class Lambda extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1092,7 +1092,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LocalFun extends AbstractIncrementalJvmCompilerRunnerTest { + public static class LocalFun extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1105,7 +1105,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/method") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Method extends AbstractIncrementalJvmCompilerRunnerTest { + public static class Method extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1118,7 +1118,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParameterDefaultValue extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ParameterDefaultValue extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1131,7 +1131,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1144,7 +1144,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SuperCall extends AbstractIncrementalJvmCompilerRunnerTest { + public static class SuperCall extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1157,7 +1157,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThisCall extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ThisCall extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1170,7 +1170,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelObjectProperty extends AbstractIncrementalJvmCompilerRunnerTest { + public static class TopLevelObjectProperty extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1183,7 +1183,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelProperty extends AbstractIncrementalJvmCompilerRunnerTest { + public static class TopLevelProperty extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1197,7 +1197,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class WithJava extends AbstractIncrementalJvmCompilerRunnerTest { + public static class WithJava extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1209,7 +1209,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1226,7 +1226,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlin extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaToKotlin extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1239,7 +1239,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndBack extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaToKotlinAndBack extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1252,7 +1252,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndRemove extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaToKotlinAndRemove extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1265,7 +1265,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinToJava extends AbstractIncrementalJvmCompilerRunnerTest { + public static class KotlinToJava extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1279,7 +1279,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaUsedInKotlin extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaUsedInKotlin extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1396,7 +1396,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeFieldType extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeFieldType extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1409,7 +1409,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1422,7 +1422,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangePropertyOverrideType extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangePropertyOverrideType extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1435,7 +1435,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeSignature extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1448,7 +1448,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivate extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeSignaturePackagePrivate extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1461,7 +1461,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1474,7 +1474,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignatureStatic extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeSignatureStatic extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1487,7 +1487,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConstantChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1500,7 +1500,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantPropertyChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConstantPropertyChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1513,7 +1513,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConstantUnchanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1526,7 +1526,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class EnumEntryAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1539,7 +1539,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryRemoved extends AbstractIncrementalJvmCompilerRunnerTest { + public static class EnumEntryRemoved extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1552,7 +1552,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1565,7 +1565,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaFieldNullabilityChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaFieldNullabilityChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1578,7 +1578,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1591,7 +1591,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1604,7 +1604,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodAddedInSuper extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1617,7 +1617,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodRenamed extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodRenamed extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1630,7 +1630,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MixedInheritance extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MixedInheritance extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1643,7 +1643,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalJvmCompilerRunnerTest { + public static class NotChangeSignature extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1656,7 +1656,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RawErrorTypeDuringSerialization extends AbstractIncrementalJvmCompilerRunnerTest { + public static class RawErrorTypeDuringSerialization extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1669,7 +1669,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/removeAnnotation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RemoveAnnotation extends AbstractIncrementalJvmCompilerRunnerTest { + public static class RemoveAnnotation extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1682,7 +1682,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SamConversions extends AbstractIncrementalJvmCompilerRunnerTest { + public static class SamConversions extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1719,7 +1719,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddDefault extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodAddDefault extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1732,7 +1732,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1745,7 +1745,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedSamAdapter extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodAddedSamAdapter extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1758,7 +1758,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodSignatureChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1771,7 +1771,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1786,7 +1786,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinUsedInJava extends AbstractIncrementalJvmCompilerRunnerTest { + public static class KotlinUsedInJava extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1858,7 +1858,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddOptionalParameter extends AbstractIncrementalJvmCompilerRunnerTest { + public static class AddOptionalParameter extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1871,7 +1871,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1884,7 +1884,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeSignature extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1897,7 +1897,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConstantChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1910,7 +1910,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConstantUnchanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1923,7 +1923,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunRenamed extends AbstractIncrementalJvmCompilerRunnerTest { + public static class FunRenamed extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1936,7 +1936,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JvmFieldChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1949,7 +1949,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldUnchanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JvmFieldUnchanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1962,7 +1962,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MethodAddedInSuper extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1975,7 +1975,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalJvmCompilerRunnerTest { + public static class NotChangeSignature extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1988,7 +1988,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalJvmCompilerRunnerTest { + public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2001,7 +2001,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFileAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PackageFileAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2014,7 +2014,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrivateChanges extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PrivateChanges extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2027,7 +2027,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyRenamed extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PropertyRenamed extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2041,7 +2041,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Other extends AbstractIncrementalJvmCompilerRunnerTest { + public static class Other extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2208,7 +2208,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2221,7 +2221,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2234,7 +2234,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRedeclaration extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ClassRedeclaration extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2247,7 +2247,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassToPackageFacade extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ClassToPackageFacade extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2260,7 +2260,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConflictingPlatformDeclarations extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ConflictingPlatformDeclarations extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2273,7 +2273,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultValueInConstructorAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class DefaultValueInConstructorAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2286,7 +2286,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2299,7 +2299,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2312,7 +2312,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2325,7 +2325,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2338,7 +2338,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmNameChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class JvmNameChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2351,7 +2351,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MainRedeclaration extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MainRedeclaration extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2364,7 +2364,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2377,7 +2377,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassFileAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2390,7 +2390,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassFileChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2403,7 +2403,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2416,7 +2416,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunction extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassInlineFunction extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2429,7 +2429,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2442,7 +2442,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreated extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassRecreated extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2455,7 +2455,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2468,7 +2468,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRemoved extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileClassRemoved extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2481,7 +2481,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileDependantUsage extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifileDependantUsage extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2494,7 +2494,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePackagePartMethodAdded extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifilePackagePartMethodAdded extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2507,7 +2507,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePartsWithProperties extends AbstractIncrementalJvmCompilerRunnerTest { + public static class MultifilePartsWithProperties extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2520,7 +2520,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/optionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OptionalParameter extends AbstractIncrementalJvmCompilerRunnerTest { + public static class OptionalParameter extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2533,7 +2533,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFacadeToClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PackageFacadeToClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2546,7 +2546,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2559,7 +2559,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2572,7 +2572,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalJvmCompilerRunnerTest { + public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2585,7 +2585,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelFunctionWithJvmName extends AbstractIncrementalJvmCompilerRunnerTest { + public static class TopLevelFunctionWithJvmName extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2598,7 +2598,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelPropertyWithJvmName extends AbstractIncrementalJvmCompilerRunnerTest { + public static class TopLevelPropertyWithJvmName extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2613,7 +2613,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IncrementalJvmCompilerOnly extends AbstractIncrementalJvmCompilerRunnerTest { + public static class IncrementalJvmCompilerOnly extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2650,7 +2650,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddAnnotationToJavaClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class AddAnnotationToJavaClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2663,7 +2663,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddNestedClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class AddNestedClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2676,7 +2676,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeAnnotationInJavaClass extends AbstractIncrementalJvmCompilerRunnerTest { + public static class ChangeAnnotationInJavaClass extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2689,7 +2689,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionRegeneratedObjectStability extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InlineFunctionRegeneratedObjectStability extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2702,7 +2702,7 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionSmapStability extends AbstractIncrementalJvmCompilerRunnerTest { + public static class InlineFunctionSmapStability extends AbstractIncrementalK1JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JvmCompilerRunnerTestGenerated.java similarity index 96% rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JvmCompilerRunnerTestGenerated.java index 640157caeca..9e02e5dd70f 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JvmCompilerRunnerTestGenerated.java @@ -19,11 +19,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrementalFirJvmCompilerRunnerTest { +public class IncrementalK2JvmCompilerRunnerTestGenerated extends AbstractIncrementalK2JvmCompilerRunnerTest { @TestMetadata("jps/jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PureKotlin extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PureKotlin extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -676,7 +676,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/classHierarchyAffected") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassHierarchyAffected extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ClassHierarchyAffected extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -894,7 +894,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunCallSite extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InlineFunCallSite extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -981,7 +981,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassProperty extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ClassProperty extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -994,7 +994,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectProperty extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class CompanionObjectProperty extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1007,7 +1007,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Coroutine extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class Coroutine extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1020,7 +1020,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Function extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class Function extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1033,7 +1033,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionIndirect extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class FunctionIndirect extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1046,7 +1046,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Getter extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class Getter extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1059,7 +1059,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Lambda extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class Lambda extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1072,7 +1072,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LocalFun extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class LocalFun extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1085,7 +1085,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/method") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Method extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class Method extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1098,7 +1098,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParameterDefaultValue extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ParameterDefaultValue extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1111,7 +1111,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1124,7 +1124,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SuperCall extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class SuperCall extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1137,7 +1137,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThisCall extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ThisCall extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1150,7 +1150,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelObjectProperty extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class TopLevelObjectProperty extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1163,7 +1163,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelProperty extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class TopLevelProperty extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1177,7 +1177,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class WithJava extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class WithJava extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1189,7 +1189,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1221,7 +1221,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlin extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaToKotlin extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1234,7 +1234,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndBack extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaToKotlinAndBack extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1247,7 +1247,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndRemove extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaToKotlinAndRemove extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1260,7 +1260,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinToJava extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class KotlinToJava extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1274,7 +1274,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaUsedInKotlin extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaUsedInKotlin extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1396,7 +1396,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeFieldType extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeFieldType extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1409,7 +1409,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1422,7 +1422,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangePropertyOverrideType extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangePropertyOverrideType extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1435,7 +1435,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeSignature extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1448,7 +1448,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivate extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeSignaturePackagePrivate extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1461,7 +1461,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1474,7 +1474,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignatureStatic extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeSignatureStatic extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1487,7 +1487,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConstantChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1500,7 +1500,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantPropertyChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConstantPropertyChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1513,7 +1513,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConstantUnchanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1526,7 +1526,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class EnumEntryAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1539,7 +1539,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryRemoved extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class EnumEntryRemoved extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1552,7 +1552,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1565,7 +1565,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaFieldNullabilityChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaFieldNullabilityChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1578,7 +1578,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1591,7 +1591,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1604,7 +1604,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodAddedInSuper extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1617,7 +1617,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodRenamed extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodRenamed extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1630,7 +1630,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MixedInheritance extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MixedInheritance extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1643,7 +1643,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class NotChangeSignature extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1656,7 +1656,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RawErrorTypeDuringSerialization extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class RawErrorTypeDuringSerialization extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1669,7 +1669,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/removeAnnotation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RemoveAnnotation extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class RemoveAnnotation extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1682,7 +1682,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SamConversions extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class SamConversions extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1719,7 +1719,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddDefault extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodAddDefault extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1732,7 +1732,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1745,7 +1745,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedSamAdapter extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodAddedSamAdapter extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1758,7 +1758,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodSignatureChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1771,7 +1771,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1786,7 +1786,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinUsedInJava extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class KotlinUsedInJava extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1868,7 +1868,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddOptionalParameter extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class AddOptionalParameter extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1881,7 +1881,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1894,7 +1894,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeSignature extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1907,7 +1907,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConstantChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1920,7 +1920,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConstantUnchanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1933,7 +1933,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunRenamed extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class FunRenamed extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1946,7 +1946,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JvmFieldChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1959,7 +1959,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldUnchanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JvmFieldUnchanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1972,7 +1972,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MethodAddedInSuper extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1985,7 +1985,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class NotChangeSignature extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1998,7 +1998,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2011,7 +2011,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFileAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PackageFileAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2024,7 +2024,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrivateChanges extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PrivateChanges extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2037,7 +2037,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyRenamed extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PropertyRenamed extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2051,7 +2051,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Other extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class Other extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2218,7 +2218,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2231,7 +2231,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2244,7 +2244,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRedeclaration extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ClassRedeclaration extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2257,7 +2257,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassToPackageFacade extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ClassToPackageFacade extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2270,7 +2270,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConflictingPlatformDeclarations extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ConflictingPlatformDeclarations extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2283,7 +2283,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultValueInConstructorAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class DefaultValueInConstructorAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2296,7 +2296,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2309,7 +2309,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2322,7 +2322,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2335,7 +2335,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2348,7 +2348,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmNameChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class JvmNameChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2361,7 +2361,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MainRedeclaration extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MainRedeclaration extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2374,7 +2374,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2387,7 +2387,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassFileAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2400,7 +2400,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassFileChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2413,7 +2413,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2426,7 +2426,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunction extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassInlineFunction extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2439,7 +2439,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2452,7 +2452,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreated extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassRecreated extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2465,7 +2465,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2478,7 +2478,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRemoved extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileClassRemoved extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2491,7 +2491,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileDependantUsage extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifileDependantUsage extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2504,7 +2504,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePackagePartMethodAdded extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifilePackagePartMethodAdded extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2517,7 +2517,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePartsWithProperties extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class MultifilePartsWithProperties extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2530,7 +2530,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/optionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OptionalParameter extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class OptionalParameter extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2543,7 +2543,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFacadeToClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PackageFacadeToClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2556,7 +2556,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2569,7 +2569,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2582,7 +2582,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2595,7 +2595,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelFunctionWithJvmName extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class TopLevelFunctionWithJvmName extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2608,7 +2608,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelPropertyWithJvmName extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class TopLevelPropertyWithJvmName extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2623,7 +2623,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IncrementalJvmCompilerOnly extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class IncrementalJvmCompilerOnly extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2660,7 +2660,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddAnnotationToJavaClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class AddAnnotationToJavaClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2673,7 +2673,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddNestedClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class AddNestedClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2686,7 +2686,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeAnnotationInJavaClass extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class ChangeAnnotationInJavaClass extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2699,7 +2699,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionRegeneratedObjectStability extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InlineFunctionRegeneratedObjectStability extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2712,7 +2712,7 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionSmapStability extends AbstractIncrementalFirJvmCompilerRunnerTest { + public static class InlineFunctionSmapStability extends AbstractIncrementalK2JvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index baf6a3c0ec0..cad7fb28e64 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -51,7 +51,7 @@ fun main(args: Array) { System.setProperty("java.awt.headless", "true") generateTestGroupSuite(args) { testGroup("compiler/incremental-compilation-impl/test", "jps/jps-plugin/testData") { - testClass( + testClass( init = incrementalJvmTestData( targetBackend = TargetBackend.JVM_IR, folderToExcludePatternMap = mapOf( @@ -62,7 +62,7 @@ fun main(args: Array) { ) // K2 - testClass( + testClass( init = incrementalJvmTestData( TargetBackend.JVM_IR, folderToExcludePatternMap = mapOf( @@ -207,7 +207,7 @@ fun main(args: Array) { } testGroup("plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen", "plugins/fir-plugin-prototype/fir-plugin-ic-test/testData") { - testClass { + testClass { model("pureKotlin", extension = null, recursive = false, targetBackend = TargetBackend.JVM_IR) } } diff --git a/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/IncrementalFirJvmWithPluginCompilerRunnerTestGenerated.java b/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/IncrementalK2JvmWithPluginCompilerRunnerTestGenerated.java similarity index 94% rename from plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/IncrementalFirJvmWithPluginCompilerRunnerTestGenerated.java rename to plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/IncrementalK2JvmWithPluginCompilerRunnerTestGenerated.java index ffc6245c594..7839e0037a8 100644 --- a/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/IncrementalFirJvmWithPluginCompilerRunnerTestGenerated.java +++ b/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests-gen/org/jetbrains/kotlin/incremental/IncrementalK2JvmWithPluginCompilerRunnerTestGenerated.java @@ -21,7 +21,7 @@ import java.util.regex.Pattern; @TestMetadata("plugins/fir-plugin-prototype/fir-plugin-ic-test/testData/pureKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class IncrementalFirJvmWithPluginCompilerRunnerTestGenerated extends AbstractIncrementalFirJvmWithPluginCompilerRunnerTest { +public class IncrementalK2JvmWithPluginCompilerRunnerTestGenerated extends AbstractIncrementalK2JvmWithPluginCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } diff --git a/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt b/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt index e2d5dd8f0c6..89fe760b8ae 100644 --- a/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt +++ b/plugins/fir-plugin-prototype/fir-plugin-ic-test/tests/org/jetbrains/kotlin/incremental/AbstractIncrementalFirJvmCompilerRunnerTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder import org.junit.jupiter.api.fail import java.io.File -abstract class AbstractIncrementalFirJvmWithPluginCompilerRunnerTest : AbstractIncrementalFirJvmCompilerRunnerTest() { +abstract class AbstractIncrementalK2JvmWithPluginCompilerRunnerTest : AbstractIncrementalK2JvmCompilerRunnerTest() { companion object { private const val ANNOTATIONS_JAR_DIR = "plugins/fir-plugin-prototype/plugin-annotations/build/libs/" private const val ANNOTATIONS_JAR_NAME = "plugin-annotations"