diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 496e4564dbc..a45a8a76d34 100755 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -974,7 +974,7 @@ fun main(args: Array) { } testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { - testClass { + testClass { model("incremental/multiModule/common", extension = null, excludeParentDirs = true) model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true) model("incremental/multiModule/multiplatform/custom", extension = null, excludeParentDirs = true) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index eb0a0b04272..0369db33eb3 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget /** * @see [jps-plugin/testData/incremental/cacheVersionChanged/README.md] */ -abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { +abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJvmJpsTest(allowNoFilesWithSuffixInTestData = true) { override fun performAdditionalModifications(modifications: List) { val modifiedFiles = modifications.filterIsInstance().map { it.path } val targets = projectDescriptor.allModuleTargets diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 00f61cb1470..776a971b38a 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -44,6 +44,7 @@ import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.LookupSymbol @@ -510,6 +511,8 @@ abstract class AbstractIncrementalJpsTest( val out = getAbsolutePath("${module.name}/out") File(out).mkdirs() compilerArguments.destination = out + } else if (compilerArguments is K2JVMCompilerArguments) { + compilerArguments.disableDefaultScriptingPlugin = true } module.jpsModule.container.setChild( diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt new file mode 100644 index 00000000000..6681dcaf615 --- /dev/null +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.jps.build + +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.jps.model.k2JvmCompilerArguments + +abstract class AbstractIncrementalJvmJpsTest( + allowNoFilesWithSuffixInTestData: Boolean = false +) : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData) { + override fun overrideModuleSettings() { + myProject.k2JvmCompilerArguments = K2JVMCompilerArguments().also { + it.disableDefaultScriptingPlugin = true + } + } +} \ No newline at end of file diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index cf61289e250..137ed8513fc 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -88,6 +88,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() { ) val args = K2JVMCompilerArguments().apply { + disableDefaultScriptingPlugin = true buildFile = moduleFile.canonicalPath reportOutputFiles = true } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java similarity index 97% rename from jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java rename to jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index e8996f4ecd2..e3c7a2b19cb 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -18,11 +18,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { +public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Common extends AbstractIncrementalJpsTest { + public static class Common extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -154,7 +154,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassAdded extends AbstractIncrementalJpsTest { + public static class ClassAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -167,7 +167,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRemoved extends AbstractIncrementalJpsTest { + public static class ClassRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -180,7 +180,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/constantValueChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantValueChanged extends AbstractIncrementalJpsTest { + public static class ConstantValueChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -193,7 +193,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CopyFileToAnotherModule extends AbstractIncrementalJpsTest { + public static class CopyFileToAnotherModule extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -206,7 +206,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJpsTest { + public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -219,7 +219,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultParameterAdded extends AbstractIncrementalJpsTest { + public static class DefaultParameterAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -232,7 +232,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJpsTest { + public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -245,7 +245,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultParameterRemoved extends AbstractIncrementalJpsTest { + public static class DefaultParameterRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -258,7 +258,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJpsTest { + public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -271,7 +271,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJpsTest { + public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -284,7 +284,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/duplicatedClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicatedClass extends AbstractIncrementalJpsTest { + public static class DuplicatedClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -297,7 +297,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/exportedDependency") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ExportedDependency extends AbstractIncrementalJpsTest { + public static class ExportedDependency extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -310,7 +310,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalJpsTest { + public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -323,7 +323,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionInlined extends AbstractIncrementalJpsTest { + public static class InlineFunctionInlined extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -336,7 +336,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJpsTest { + public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -349,7 +349,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MoveFileToAnotherModule extends AbstractIncrementalJpsTest { + public static class MoveFileToAnotherModule extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -362,7 +362,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simple") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Simple extends AbstractIncrementalJpsTest { + public static class Simple extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -375,7 +375,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependency") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SimpleDependency extends AbstractIncrementalJpsTest { + public static class SimpleDependency extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -388,7 +388,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJpsTest { + public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -401,7 +401,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJpsTest { + public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -414,7 +414,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SimpleDependencyUnchanged extends AbstractIncrementalJpsTest { + public static class SimpleDependencyUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -427,7 +427,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveDependency") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TransitiveDependency extends AbstractIncrementalJpsTest { + public static class TransitiveDependency extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -440,7 +440,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveInlining") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TransitiveInlining extends AbstractIncrementalJpsTest { + public static class TransitiveInlining extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -453,7 +453,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/common/twoDependants") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TwoDependants extends AbstractIncrementalJpsTest { + public static class TwoDependants extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -467,7 +467,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Jvm extends AbstractIncrementalJpsTest { + public static class Jvm extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -504,7 +504,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circular") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Circular extends AbstractIncrementalJpsTest { + public static class Circular extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -517,7 +517,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencyClasses extends AbstractIncrementalJpsTest { + public static class CircularDependencyClasses extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -530,7 +530,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencySamePackageUnchanged extends AbstractIncrementalJpsTest { + public static class CircularDependencySamePackageUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -543,7 +543,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencyTopLevelFunctions extends AbstractIncrementalJpsTest { + public static class CircularDependencyTopLevelFunctions extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -556,7 +556,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencyWithAccessToInternal extends AbstractIncrementalJpsTest { + public static class CircularDependencyWithAccessToInternal extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -570,7 +570,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Custom extends AbstractIncrementalJpsTest { + public static class Custom extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -607,7 +607,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BuildError extends AbstractIncrementalJpsTest { + public static class BuildError extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -620,7 +620,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BuildError2Levels extends AbstractIncrementalJpsTest { + public static class BuildError2Levels extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -633,7 +633,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CommonSourcesCompilerArg extends AbstractIncrementalJpsTest { + public static class CommonSourcesCompilerArg extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -646,7 +646,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ComplementaryFiles extends AbstractIncrementalJpsTest { + public static class ComplementaryFiles extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -659,7 +659,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotSameCompiler extends AbstractIncrementalJpsTest { + public static class NotSameCompiler extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -673,7 +673,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PureKotlin extends AbstractIncrementalJpsTest { + public static class PureKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1276,7 +1276,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class WithJava extends AbstractIncrementalJpsTest { + public static class WithJava extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1288,7 +1288,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { + public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1320,7 +1320,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlin extends AbstractIncrementalJpsTest { + public static class JavaToKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1333,7 +1333,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndBack extends AbstractIncrementalJpsTest { + public static class JavaToKotlinAndBack extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1346,7 +1346,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndRemove extends AbstractIncrementalJpsTest { + public static class JavaToKotlinAndRemove extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1359,7 +1359,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinToJava extends AbstractIncrementalJpsTest { + public static class KotlinToJava extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1373,7 +1373,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { + public static class JavaUsedInKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1480,7 +1480,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeFieldType extends AbstractIncrementalJpsTest { + public static class ChangeFieldType extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1493,7 +1493,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalJpsTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1506,7 +1506,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangePropertyOverrideType extends AbstractIncrementalJpsTest { + public static class ChangePropertyOverrideType extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1519,7 +1519,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalJpsTest { + public static class ChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1532,7 +1532,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivate extends AbstractIncrementalJpsTest { + public static class ChangeSignaturePackagePrivate extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1545,7 +1545,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalJpsTest { + public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1558,7 +1558,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignatureStatic extends AbstractIncrementalJpsTest { + public static class ChangeSignatureStatic extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1571,7 +1571,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalJpsTest { + public static class ConstantChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1584,7 +1584,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalJpsTest { + public static class ConstantUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1597,7 +1597,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryAdded extends AbstractIncrementalJpsTest { + public static class EnumEntryAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1610,7 +1610,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryRemoved extends AbstractIncrementalJpsTest { + public static class EnumEntryRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1623,7 +1623,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalJpsTest { + public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1636,7 +1636,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaFieldNullabilityChanged extends AbstractIncrementalJpsTest { + public static class JavaFieldNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1649,7 +1649,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalJpsTest { + public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1662,7 +1662,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalJpsTest { + public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1675,7 +1675,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalJpsTest { + public static class MethodAddedInSuper extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1688,7 +1688,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodRenamed extends AbstractIncrementalJpsTest { + public static class MethodRenamed extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1701,7 +1701,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MixedInheritance extends AbstractIncrementalJpsTest { + public static class MixedInheritance extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1714,7 +1714,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalJpsTest { + public static class NotChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1727,7 +1727,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SamConversions extends AbstractIncrementalJpsTest { + public static class SamConversions extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1759,7 +1759,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAdded extends AbstractIncrementalJpsTest { + public static class MethodAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1772,7 +1772,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedSamAdapter extends AbstractIncrementalJpsTest { + public static class MethodAddedSamAdapter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1785,7 +1785,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChanged extends AbstractIncrementalJpsTest { + public static class MethodSignatureChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1798,7 +1798,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalJpsTest { + public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1813,7 +1813,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { + public static class KotlinUsedInJava extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1895,7 +1895,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddOptionalParameter extends AbstractIncrementalJpsTest { + public static class AddOptionalParameter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1908,7 +1908,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalJpsTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1921,7 +1921,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalJpsTest { + public static class ChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1934,7 +1934,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalJpsTest { + public static class ConstantChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1947,7 +1947,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalJpsTest { + public static class ConstantUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1960,7 +1960,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunRenamed extends AbstractIncrementalJpsTest { + public static class FunRenamed extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1973,7 +1973,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldChanged extends AbstractIncrementalJpsTest { + public static class JvmFieldChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1986,7 +1986,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldUnchanged extends AbstractIncrementalJpsTest { + public static class JvmFieldUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -1999,7 +1999,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalJpsTest { + public static class MethodAddedInSuper extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2012,7 +2012,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalJpsTest { + public static class NotChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2025,7 +2025,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalJpsTest { + public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2038,7 +2038,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFileAdded extends AbstractIncrementalJpsTest { + public static class PackageFileAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2051,7 +2051,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrivateChanges extends AbstractIncrementalJpsTest { + public static class PrivateChanges extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2064,7 +2064,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyRenamed extends AbstractIncrementalJpsTest { + public static class PropertyRenamed extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2078,7 +2078,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Other extends AbstractIncrementalJpsTest { + public static class Other extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2230,7 +2230,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalJpsTest { + public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2243,7 +2243,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalJpsTest { + public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2256,7 +2256,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/classRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRedeclaration extends AbstractIncrementalJpsTest { + public static class ClassRedeclaration extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2269,7 +2269,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/classToPackageFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassToPackageFacade extends AbstractIncrementalJpsTest { + public static class ClassToPackageFacade extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2282,7 +2282,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConflictingPlatformDeclarations extends AbstractIncrementalJpsTest { + public static class ConflictingPlatformDeclarations extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2295,7 +2295,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultValueInConstructorAdded extends AbstractIncrementalJpsTest { + public static class DefaultValueInConstructorAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2308,7 +2308,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalJpsTest { + public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2321,7 +2321,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalJpsTest { + public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2334,7 +2334,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalJpsTest { + public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2347,7 +2347,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/jvmNameChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmNameChanged extends AbstractIncrementalJpsTest { + public static class JvmNameChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2360,7 +2360,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/mainRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MainRedeclaration extends AbstractIncrementalJpsTest { + public static class MainRedeclaration extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2373,7 +2373,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalJpsTest { + public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2386,7 +2386,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileAdded extends AbstractIncrementalJpsTest { + public static class MultifileClassFileAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2399,7 +2399,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileChanged extends AbstractIncrementalJpsTest { + public static class MultifileClassFileChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2412,7 +2412,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalJpsTest { + public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2425,7 +2425,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunction extends AbstractIncrementalJpsTest { + public static class MultifileClassInlineFunction extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2438,7 +2438,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalJpsTest { + public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2451,7 +2451,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreated extends AbstractIncrementalJpsTest { + public static class MultifileClassRecreated extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2464,7 +2464,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalJpsTest { + public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2477,7 +2477,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRemoved extends AbstractIncrementalJpsTest { + public static class MultifileClassRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2490,7 +2490,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePackagePartMethodAdded extends AbstractIncrementalJpsTest { + public static class MultifilePackagePartMethodAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2503,7 +2503,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/optionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OptionalParameter extends AbstractIncrementalJpsTest { + public static class OptionalParameter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2516,7 +2516,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFacadeToClass extends AbstractIncrementalJpsTest { + public static class PackageFacadeToClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2529,7 +2529,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalJpsTest { + public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2542,7 +2542,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalJpsTest { + public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2555,7 +2555,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalJpsTest { + public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2568,7 +2568,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelFunctionWithJvmName extends AbstractIncrementalJpsTest { + public static class TopLevelFunctionWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2581,7 +2581,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelPropertyWithJvmName extends AbstractIncrementalJpsTest { + public static class TopLevelPropertyWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2596,7 +2596,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunCallSite extends AbstractIncrementalJpsTest { + public static class InlineFunCallSite extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2678,7 +2678,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassProperty extends AbstractIncrementalJpsTest { + public static class ClassProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2691,7 +2691,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectProperty extends AbstractIncrementalJpsTest { + public static class CompanionObjectProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2704,7 +2704,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/coroutine") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Coroutine extends AbstractIncrementalJpsTest { + public static class Coroutine extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2717,7 +2717,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Function extends AbstractIncrementalJpsTest { + public static class Function extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2730,7 +2730,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Getter extends AbstractIncrementalJpsTest { + public static class Getter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2743,7 +2743,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Lambda extends AbstractIncrementalJpsTest { + public static class Lambda extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2756,7 +2756,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LocalFun extends AbstractIncrementalJpsTest { + public static class LocalFun extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2769,7 +2769,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Method extends AbstractIncrementalJpsTest { + public static class Method extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2782,7 +2782,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParameterDefaultValue extends AbstractIncrementalJpsTest { + public static class ParameterDefaultValue extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2795,7 +2795,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalJpsTest { + public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2808,7 +2808,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SuperCall extends AbstractIncrementalJpsTest { + public static class SuperCall extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2821,7 +2821,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThisCall extends AbstractIncrementalJpsTest { + public static class ThisCall extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2834,7 +2834,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelObjectProperty extends AbstractIncrementalJpsTest { + public static class TopLevelObjectProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2847,7 +2847,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelProperty extends AbstractIncrementalJpsTest { + public static class TopLevelProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -2861,7 +2861,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassHierarchyAffected extends AbstractIncrementalJpsTest { + public static class ClassHierarchyAffected extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3068,7 +3068,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationFlagRemoved extends AbstractIncrementalJpsTest { + public static class AnnotationFlagRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3081,7 +3081,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationListChanged extends AbstractIncrementalJpsTest { + public static class AnnotationListChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3094,7 +3094,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BridgeGenerated extends AbstractIncrementalJpsTest { + public static class BridgeGenerated extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3107,7 +3107,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassBecameFinal extends AbstractIncrementalJpsTest { + public static class ClassBecameFinal extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3120,7 +3120,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassBecameInterface extends AbstractIncrementalJpsTest { + public static class ClassBecameInterface extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3133,7 +3133,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassBecamePrivate extends AbstractIncrementalJpsTest { + public static class ClassBecamePrivate extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3146,7 +3146,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassMovedIntoOtherClass extends AbstractIncrementalJpsTest { + public static class ClassMovedIntoOtherClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3159,7 +3159,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRemoved extends AbstractIncrementalJpsTest { + public static class ClassRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3172,7 +3172,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRemovedAndRestored extends AbstractIncrementalJpsTest { + public static class ClassRemovedAndRestored extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3185,7 +3185,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectInheritedMemberChanged extends AbstractIncrementalJpsTest { + public static class CompanionObjectInheritedMemberChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3198,7 +3198,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectMemberChanged extends AbstractIncrementalJpsTest { + public static class CompanionObjectMemberChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3211,7 +3211,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectNameChanged extends AbstractIncrementalJpsTest { + public static class CompanionObjectNameChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3224,7 +3224,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectToSimpleObject extends AbstractIncrementalJpsTest { + public static class CompanionObjectToSimpleObject extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3237,7 +3237,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstructorVisibilityChanged extends AbstractIncrementalJpsTest { + public static class ConstructorVisibilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3250,7 +3250,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryAdded extends AbstractIncrementalJpsTest { + public static class EnumEntryAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3263,7 +3263,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryRemoved extends AbstractIncrementalJpsTest { + public static class EnumEntryRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3276,7 +3276,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumMemberChanged extends AbstractIncrementalJpsTest { + public static class EnumMemberChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3289,7 +3289,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FlagsAndMemberInDifferentClassesChanged extends AbstractIncrementalJpsTest { + public static class FlagsAndMemberInDifferentClassesChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3302,7 +3302,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FlagsAndMemberInSameClassChanged extends AbstractIncrementalJpsTest { + public static class FlagsAndMemberInSameClassChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3315,7 +3315,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ImplcitUpcast extends AbstractIncrementalJpsTest { + public static class ImplcitUpcast extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3328,7 +3328,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InferredTypeArgumentChanged extends AbstractIncrementalJpsTest { + public static class InferredTypeArgumentChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3341,7 +3341,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InferredTypeChanged extends AbstractIncrementalJpsTest { + public static class InferredTypeChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3354,7 +3354,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LambdaParameterAffected extends AbstractIncrementalJpsTest { + public static class LambdaParameterAffected extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3367,7 +3367,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAdded extends AbstractIncrementalJpsTest { + public static class MethodAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3380,7 +3380,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAnnotationAdded extends AbstractIncrementalJpsTest { + public static class MethodAnnotationAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3393,7 +3393,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodNullabilityChanged extends AbstractIncrementalJpsTest { + public static class MethodNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3406,7 +3406,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodParameterWithDefaultValueAdded extends AbstractIncrementalJpsTest { + public static class MethodParameterWithDefaultValueAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3419,7 +3419,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodRemoved extends AbstractIncrementalJpsTest { + public static class MethodRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3432,7 +3432,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OverrideExplicit extends AbstractIncrementalJpsTest { + public static class OverrideExplicit extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3445,7 +3445,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OverrideImplicit extends AbstractIncrementalJpsTest { + public static class OverrideImplicit extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3458,7 +3458,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyNullabilityChanged extends AbstractIncrementalJpsTest { + public static class PropertyNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3471,7 +3471,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SealedClassImplAdded extends AbstractIncrementalJpsTest { + public static class SealedClassImplAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3484,7 +3484,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SealedClassIndirectImplAdded extends AbstractIncrementalJpsTest { + public static class SealedClassIndirectImplAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3497,7 +3497,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SealedClassNestedImplAdded extends AbstractIncrementalJpsTest { + public static class SealedClassNestedImplAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3510,7 +3510,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SecondaryConstructorAdded extends AbstractIncrementalJpsTest { + public static class SecondaryConstructorAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3523,7 +3523,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class StarProjectionUpperBoundChanged extends AbstractIncrementalJpsTest { + public static class StarProjectionUpperBoundChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3536,7 +3536,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SupertypesListChanged extends AbstractIncrementalJpsTest { + public static class SupertypesListChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3549,7 +3549,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameterListChanged extends AbstractIncrementalJpsTest { + public static class TypeParameterListChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } @@ -3562,7 +3562,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class VarianceChanged extends AbstractIncrementalJpsTest { + public static class VarianceChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt index aa117a1b866..3e0be6a8cf2 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt @@ -28,7 +28,7 @@ import java.io.File abstract class AbstractJvmProtoComparisonTest : AbstractProtoComparisonTest() { override fun compileAndGetClasses(sourceDir: File, outputDir: File): Map { - MockLibraryUtil.compileKotlin(sourceDir.path, outputDir) + MockLibraryUtil.compileKotlin(sourceDir.path, outputDir, extraOptions = listOf("-Xdisable-default-scripting-plugin")) val classFiles = outputDir.walkMatching { it.name.endsWith(".class") } val localClassFiles = classFiles.map { LocalFileKotlinClass.create(it)!! }