[JS] rename IC tests to easier distinguish between the K1/K2 variants
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsKlibCompilerRunnerTest.kt
similarity index 75%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsKlibCompilerRunnerTest.kt
index 659ce12..14bfc76 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsKlibCompilerRunnerTest.kt
@@ -4,7 +4,7 @@
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
import java.io.File
-abstract class AbstractIncrementalJsKlibCompilerRunnerTest : AbstractIncrementalJsCompilerRunnerTest() {
+abstract class AbstractIncrementalK1JsKlibCompilerRunnerTest : AbstractIncrementalK1JsLegacyCompilerRunnerTest() {
override fun createCompilerArguments(destinationDir: File, testDir: File): K2JSCompilerArguments =
K2JSCompilerArguments().apply {
libraries = "build/js-ir-runtime/full-runtime.klib"
@@ -21,11 +21,11 @@
get() = super.buildLogFinder.copy(isKlibEnabled = true)
}
-abstract class AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalJsKlibCompilerRunnerTest() {
+abstract class AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalK1JsKlibCompilerRunnerTest() {
override val scopeExpansionMode = CompileScopeExpansionMode.ALWAYS
}
-abstract class AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest() {
+abstract class AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest() {
override fun createCompilerArguments(destinationDir: File, testDir: File): K2JSCompilerArguments {
return super.createCompilerArguments(destinationDir, testDir).apply {
useK2 = true
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest.kt
similarity index 94%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest.kt
index f8602bc..ce40618 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest.kt
@@ -13,7 +13,7 @@
import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION
import java.io.File
-abstract class AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest :
+abstract class AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest :
AbstractIncrementalMultiModuleCompilerRunnerTest<K2JSCompilerArguments, ModulesApiHistoryJs>() {
override fun createCompilerArguments(destinationDir: File, testDir: File): K2JSCompilerArguments =
@@ -92,8 +92,8 @@
}
}
-abstract class AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest :
- AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest() {
+abstract class AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest :
+ AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest() {
override fun createCompilerArguments(destinationDir: File, testDir: File): K2JSCompilerArguments {
return super.createCompilerArguments(destinationDir, testDir).apply {
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyCompilerRunnerTest.kt
similarity index 91%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyCompilerRunnerTest.kt
index d11e7bb..2566594 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyCompilerRunnerTest.kt
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.incremental
-import org.jetbrains.kotlin.cli.common.CompilerSystemProperties
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
import org.jetbrains.kotlin.incremental.utils.TestCompilationResult
@@ -24,7 +23,7 @@
import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
import java.io.File
-abstract class AbstractIncrementalJsCompilerRunnerTest : AbstractIncrementalCompilerRunnerTestBase<K2JSCompilerArguments>() {
+abstract class AbstractIncrementalK1JsLegacyCompilerRunnerTest : AbstractIncrementalCompilerRunnerTestBase<K2JSCompilerArguments>() {
override fun make(cacheDir: File, outDir: File, sourceRoots: Iterable<File>, args: K2JSCompilerArguments): TestCompilationResult {
val reporter = TestICReporter()
val messageCollector = TestMessageCollector()
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTest.kt
similarity index 87%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTest.kt
index c278863..7d18fd5a 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTest.kt
@@ -19,7 +19,7 @@
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import java.io.File
-abstract class AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest : AbstractIncrementalJsCompilerRunnerTest() {
+abstract class AbstractIncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTest : AbstractIncrementalK1JsLegacyCompilerRunnerTest() {
override fun createCompilerArguments(destinationDir: File, testDir: File): K2JSCompilerArguments =
super.createCompilerArguments(destinationDir, testDir).apply {
friendModulesDisabled = true
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJsCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt
similarity index 87%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJsCompilerRunnerTest.kt
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt
index 1e05966..3850c32 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiplatformJsCompilerRunnerTest.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest.kt
@@ -19,7 +19,7 @@
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import java.io.File
-abstract class AbstractIncrementalMultiplatformJsCompilerRunnerTest : AbstractIncrementalJsCompilerRunnerTest() {
+abstract class AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest : AbstractIncrementalK1JsLegacyCompilerRunnerTest() {
override fun createCompilerArguments(destinationDir: File, testDir: File): K2JSCompilerArguments {
return super.createCompilerArguments(destinationDir, testDir).apply {
multiPlatform = true
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerRunnerTestGenerated.java
similarity index 98%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerRunnerTestGenerated.java
index 3f5ff19..50b1f20 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerRunnerTestGenerated.java
@@ -18,11 +18,11 @@
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalJsKlibCompilerRunnerTestGenerated extends AbstractIncrementalJsKlibCompilerRunnerTest {
+public class IncrementalK1JsKlibCompilerRunnerTestGenerated extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
@TestMetadata("jps/jps-plugin/testData/incremental/pureKotlin")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class PureKotlin extends AbstractIncrementalJsKlibCompilerRunnerTest {
+ public static class PureKotlin extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -660,7 +660,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/classHierarchyAffected")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassHierarchyAffected extends AbstractIncrementalJsKlibCompilerRunnerTest {
+ public static class ClassHierarchyAffected extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -878,7 +878,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class Js extends AbstractIncrementalJsKlibCompilerRunnerTest {
+ public static class Js extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -895,7 +895,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class FriendsModuleDisabled extends AbstractIncrementalJsKlibCompilerRunnerTest {
+ public static class FriendsModuleDisabled extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -912,7 +912,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InternalInlineFunctionIsChanged extends AbstractIncrementalJsKlibCompilerRunnerTest {
+ public static class InternalInlineFunctionIsChanged extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -926,7 +926,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalJsKlibCompilerRunnerTest {
+ public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalK1JsKlibCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
similarity index 98%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
index e9ab2fd..de2677c 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
@@ -18,11 +18,11 @@
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+public class IncrementalK1JsKlibCompilerWithScopeExpansionRunnerTestGenerated extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
@TestMetadata("jps/jps-plugin/testData/incremental/pureKotlin")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class PureKotlin extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class PureKotlin extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -660,7 +660,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/classHierarchyAffected")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassHierarchyAffected extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ClassHierarchyAffected extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -878,7 +878,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class Js extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class Js extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -895,7 +895,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class FriendsModuleDisabled extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class FriendsModuleDisabled extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -912,7 +912,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InternalInlineFunctionIsChanged extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class InternalInlineFunctionIsChanged extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -926,7 +926,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -940,7 +940,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ScopeExpansion extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ScopeExpansion extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -962,7 +962,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ChangeTypeAliasAndUsage extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ChangeTypeAliasAndUsage extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -975,7 +975,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ProtectedBecomesPublicAccessedTroughChild extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ProtectedBecomesPublicAccessedTroughChild extends AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibMultiModuleCompilerRunnerTestGenerated.java
similarity index 93%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated.java
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibMultiModuleCompilerRunnerTestGenerated.java
index 1ad92a7..071f57d 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibMultiModuleCompilerRunnerTestGenerated.java
@@ -20,7 +20,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+public class IncrementalK1JsKlibMultiModuleCompilerRunnerTestGenerated extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -152,7 +152,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassAdded extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ClassAdded extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -165,7 +165,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ClassRemoved extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -178,7 +178,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ConstantValueChanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ConstantValueChanged extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -191,7 +191,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class CopyFileToAnotherModule extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class CopyFileToAnotherModule extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -204,7 +204,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -217,7 +217,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterAdded extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterAdded extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -230,7 +230,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -243,7 +243,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterRemoved extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -256,7 +256,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -269,7 +269,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultValueInConstructorRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultValueInConstructorRemoved extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -282,7 +282,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DuplicatedClass extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DuplicatedClass extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -295,7 +295,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ExportedDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ExportedDependency extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -308,7 +308,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -321,7 +321,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionInlined extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class InlineFunctionInlined extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -334,7 +334,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionTwoPackageParts extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class InlineFunctionTwoPackageParts extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -347,7 +347,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class MoveFileToAnotherModule extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class MoveFileToAnotherModule extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -360,7 +360,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class Simple extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class Simple extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -373,7 +373,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependency extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -386,7 +386,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -399,7 +399,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -412,7 +412,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyUnchanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependencyUnchanged extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -425,7 +425,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TransitiveDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class TransitiveDependency extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -438,7 +438,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TransitiveInlining extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class TransitiveInlining extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -451,7 +451,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TwoDependants extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class TwoDependants extends AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithFriendModulesDisabledTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTestGenerated.java
similarity index 90%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithFriendModulesDisabledTestGenerated.java
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTestGenerated.java
index 3b4e6f2..05ccf6b 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithFriendModulesDisabledTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTestGenerated.java
@@ -20,7 +20,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalJsCompilerRunnerWithFriendModulesDisabledTestGenerated extends AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest {
+public class IncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTestGenerated extends AbstractIncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsLegacyMultiplatformJsCompilerRunnerTestGenerated.java
similarity index 88%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsLegacyMultiplatformJsCompilerRunnerTestGenerated.java
index 404ad28..7c2fdc3 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsLegacyMultiplatformJsCompilerRunnerTestGenerated.java
@@ -20,7 +20,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
+public class IncrementalK1JsLegacyMultiplatformJsCompilerRunnerTestGenerated extends AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -42,7 +42,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TouchActual extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
+ public static class TouchActual extends AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -55,7 +55,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TouchExpect extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
+ public static class TouchExpect extends AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
similarity index 98%
rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated.java
rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
index 1c17f7c..aefee85 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
@@ -18,11 +18,11 @@
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+public class IncrementalK2JsKlibCompilerWithScopeExpansionRunnerTestGenerated extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
@TestMetadata("jps/jps-plugin/testData/incremental/pureKotlin")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class PureKotlin extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class PureKotlin extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -655,7 +655,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/classHierarchyAffected")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassHierarchyAffected extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ClassHierarchyAffected extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -873,7 +873,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class Js extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class Js extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -890,7 +890,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class FriendsModuleDisabled extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class FriendsModuleDisabled extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -907,7 +907,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InternalInlineFunctionIsChanged extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class InternalInlineFunctionIsChanged extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -921,7 +921,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -935,7 +935,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ScopeExpansion extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ScopeExpansion extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -957,7 +957,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ChangeTypeAliasAndUsage extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ChangeTypeAliasAndUsage extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -970,7 +970,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ProtectedBecomesPublicAccessedTroughChild extends AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest {
+ public static class ProtectedBecomesPublicAccessedTroughChild extends AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibMultiModuleCompilerRunnerTestGenerated.java
similarity index 93%
copy from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated.java
copy to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibMultiModuleCompilerRunnerTestGenerated.java
index 1ad92a7..24bcdb2 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibMultiModuleCompilerRunnerTestGenerated.java
@@ -20,7 +20,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalMultiModuleJsKlibCompilerRunnerTestGenerated extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+public class IncrementalK2JsKlibMultiModuleCompilerRunnerTestGenerated extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -152,7 +152,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassAdded extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ClassAdded extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -165,7 +165,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ClassRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ClassRemoved extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -178,7 +178,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ConstantValueChanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ConstantValueChanged extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -191,7 +191,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class CopyFileToAnotherModule extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class CopyFileToAnotherModule extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -204,7 +204,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -217,7 +217,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterAdded extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterAdded extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -230,7 +230,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -243,7 +243,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterRemoved extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -256,7 +256,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -269,7 +269,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultValueInConstructorRemoved extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DefaultValueInConstructorRemoved extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -282,7 +282,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class DuplicatedClass extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class DuplicatedClass extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -295,7 +295,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class ExportedDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class ExportedDependency extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -308,7 +308,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -321,7 +321,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionInlined extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class InlineFunctionInlined extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -334,7 +334,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionTwoPackageParts extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class InlineFunctionTwoPackageParts extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -347,7 +347,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class MoveFileToAnotherModule extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class MoveFileToAnotherModule extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -360,7 +360,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class Simple extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class Simple extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -373,7 +373,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependency extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -386,7 +386,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -399,7 +399,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -412,7 +412,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyUnchanged extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class SimpleDependencyUnchanged extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -425,7 +425,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TransitiveDependency extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class TransitiveDependency extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -438,7 +438,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TransitiveInlining extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class TransitiveInlining extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@@ -451,7 +451,7 @@
@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
- public static class TwoDependants extends AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest {
+ public static class TwoDependants extends AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsFirKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsFirKlibCompilerRunnerTestGenerated.java
deleted file mode 100644
index eddc7b8..0000000
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiModuleJsFirKlibCompilerRunnerTestGenerated.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class IncrementalMultiModuleJsFirKlibCompilerRunnerTestGenerated extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInCommon() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
-
- @TestMetadata("classAdded")
- public void testClassAdded() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/classAdded/");
- }
-
- @TestMetadata("classRemoved")
- public void testClassRemoved() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/");
- }
-
- @TestMetadata("constantValueChanged")
- public void testConstantValueChanged() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/");
- }
-
- @TestMetadata("copyFileToAnotherModule")
- public void testCopyFileToAnotherModule() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/");
- }
-
- @TestMetadata("defaultArgumentInConstructorRemoved")
- public void testDefaultArgumentInConstructorRemoved() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
- }
-
- @TestMetadata("defaultParameterAdded")
- public void testDefaultParameterAdded() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/");
- }
-
- @TestMetadata("defaultParameterAddedForTopLevelFun")
- public void testDefaultParameterAddedForTopLevelFun() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
- }
-
- @TestMetadata("defaultParameterRemoved")
- public void testDefaultParameterRemoved() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/");
- }
-
- @TestMetadata("defaultParameterRemovedForTopLevelFun")
- public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
- }
-
- @TestMetadata("defaultValueInConstructorRemoved")
- public void testDefaultValueInConstructorRemoved() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
- }
-
- @TestMetadata("duplicatedClass")
- public void testDuplicatedClass() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/");
- }
-
- @TestMetadata("exportedDependency")
- public void testExportedDependency() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/");
- }
-
- @TestMetadata("functionFromDifferentPackageChanged")
- public void testFunctionFromDifferentPackageChanged() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
- }
-
- @TestMetadata("inlineFunctionInlined")
- public void testInlineFunctionInlined() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/");
- }
-
- @TestMetadata("inlineFunctionTwoPackageParts")
- public void testInlineFunctionTwoPackageParts() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
- }
-
- @TestMetadata("moveFileToAnotherModule")
- public void testMoveFileToAnotherModule() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/");
- }
-
- @TestMetadata("simple")
- public void testSimple() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/simple/");
- }
-
- @TestMetadata("simpleDependency")
- public void testSimpleDependency() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/");
- }
-
- @TestMetadata("simpleDependencyErrorOnAccessToInternal1")
- public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
- }
-
- @TestMetadata("simpleDependencyErrorOnAccessToInternal2")
- public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
- }
-
- @TestMetadata("simpleDependencyUnchanged")
- public void testSimpleDependencyUnchanged() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/");
- }
-
- @TestMetadata("transitiveDependency")
- public void testTransitiveDependency() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/");
- }
-
- @TestMetadata("transitiveInlining")
- public void testTransitiveInlining() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/");
- }
-
- @TestMetadata("twoDependants")
- public void testTwoDependants() throws Exception {
- runTest("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/");
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classAdded")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class ClassAdded extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInClassAdded() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class ClassRemoved extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInClassRemoved() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class ConstantValueChanged extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInConstantValueChanged() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class CopyFileToAnotherModule extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterAdded extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDefaultParameterAdded() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterRemoved extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDefaultParameterRemoved() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DefaultValueInConstructorRemoved extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class DuplicatedClass extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInDuplicatedClass() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class ExportedDependency extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInExportedDependency() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionInlined extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInInlineFunctionInlined() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class InlineFunctionTwoPackageParts extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class MoveFileToAnotherModule extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simple")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class Simple extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInSimple() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependency extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInSimpleDependency() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class SimpleDependencyUnchanged extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class TransitiveDependency extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInTransitiveDependency() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class TransitiveInlining extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInTransitiveInlining() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-
- @TestMetadata("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class TwoDependants extends AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest {
- private void runTest(String testDataFilePath) throws Exception {
- KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
- }
-
- public void testAllFilesPresentInTwoDependants() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true);
- }
- }
-}
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 10801d9..6700ed3 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -96,22 +96,22 @@
)
)
- testClass<AbstractIncrementalJsKlibCompilerRunnerTest>() {
+ testClass<AbstractIncrementalK1JsKlibCompilerRunnerTest>() {
// IC of sealed interfaces are not supported in JS
model("incremental/pureKotlin", extension = null, recursive = false, excludedPattern = "(^sealed.*)|(.*SinceK2)")
model("incremental/classHierarchyAffected", extension = null, recursive = false)
model("incremental/js", extension = null, excludeParentDirs = true)
}
- testClass<AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest> {
+ testClass<AbstractIncrementalK1JsKlibMultiModuleCompilerRunnerTest> {
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
}
- testClass<AbstractIncrementalMultiModuleJsFirKlibCompilerRunnerTest> {
+ testClass<AbstractIncrementalK2JsKlibMultiModuleCompilerRunnerTest> {
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
}
- testClass<AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest> {
+ testClass<AbstractIncrementalK1JsKlibCompilerWithScopeExpansionRunnerTest> {
// IC of sealed interfaces are not supported in JS
model("incremental/pureKotlin", extension = null, recursive = false, excludedPattern = "^sealed.*")
model("incremental/classHierarchyAffected", extension = null, recursive = false)
@@ -119,7 +119,7 @@
model("incremental/scopeExpansion", extension = null, excludeParentDirs = true)
}
- testClass<AbstractIncrementalJsFirKlibCompilerWithScopeExpansionRunnerTest> {
+ testClass<AbstractIncrementalK2JsKlibCompilerWithScopeExpansionRunnerTest> {
// IC of sealed interfaces are not supported in JS
model("incremental/pureKotlin", extension = null, recursive = false,
// TODO: 'fileWithConstantRemoved' should be fixed in https://youtrack.jetbrains.com/issue/KT-58824
@@ -129,7 +129,7 @@
model("incremental/scopeExpansion", extension = null, excludeParentDirs = true)
}
- testClass<AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest> {
+ testClass<AbstractIncrementalK1JsLegacyCompilerRunnerWithFriendModulesDisabledTest> {
model("incremental/js/friendsModuleDisabled", extension = null, recursive = false)
}
@@ -137,7 +137,7 @@
model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true)
model("incremental/mpp/jvmOnly", extension = null, excludeParentDirs = true)
}
- testClass<AbstractIncrementalMultiplatformJsCompilerRunnerTest> {
+ testClass<AbstractIncrementalK1JsLegacyMultiplatformJsCompilerRunnerTest> {
model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true)
}
}
