diff --git a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt index 9a3570f2305..c6abe50c4d1 100644 --- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt +++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt @@ -27,10 +27,11 @@ data class BuildLogFinder( private const val JS_LOG = "js-build.log" private const val GRADLE_LOG = "gradle-build.log" private const val DATA_CONTAINER_LOG = "data-container-version-build.log" + const val JS_JPS_LOG = "js-jps-build.log" private const val SIMPLE_LOG = "build.log" fun isJpsLogFile(file: File): Boolean = - file.name.let { it == SIMPLE_LOG || it == DATA_CONTAINER_LOG } + file.name in arrayOf(SIMPLE_LOG, JS_JPS_LOG, DATA_CONTAINER_LOG) } fun findBuildLog(dir: File): File? { @@ -39,6 +40,7 @@ data class BuildLogFinder( val matchedName = when { isJsEnabled && JS_LOG in files -> JS_LOG isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG + isJsEnabled && JS_JPS_LOG in files -> JS_JPS_LOG isDataContainerBuildLogEnabled && DATA_CONTAINER_LOG in files -> DATA_CONTAINER_LOG SIMPLE_LOG in files -> SIMPLE_LOG else -> null diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 566a459e9d3..d14c57a4b23 100755 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -928,7 +928,8 @@ fun main(args: Array) { testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { testClass { - model("incremental/multiModule", extension = null, excludeParentDirs = true) + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, recursive = false) model("incremental/withJava", extension = null, excludeParentDirs = true) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) @@ -937,6 +938,10 @@ fun main(args: Array) { actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule") + testClass { + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + } + testClass { model( "incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true, diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.172 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.172 index 43fbebaae4c..b82f8a2ac6f 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.172 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.172 @@ -917,7 +917,8 @@ fun main(args: Array) { testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { testClass { - model("incremental/multiModule", extension = null, excludeParentDirs = true) + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, recursive = false) model("incremental/withJava", extension = null, excludeParentDirs = true) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) @@ -926,6 +927,10 @@ fun main(args: Array) { actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule") + testClass { + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + } + testClass { model( "incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true, diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as31 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as31 index 3eaaa7d0da9..907de0a6650 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as31 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as31 @@ -928,13 +928,27 @@ fun main(args: Array) { /* There is no jps in AS testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { testClass { - model("incremental/multiModule", extension = null, excludeParentDirs = true) + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, recursive = false) model("incremental/withJava", extension = null, excludeParentDirs = true) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true) } + actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule") + + testClass { + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + } + + testClass { + model( + "incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true, + testClassName = "MultiplatformMultiModule", recursive = true + ) + } + testClass { model("incremental/lookupTracker/jvm", extension = null, recursive = false) } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as32 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as32 index 3eaaa7d0da9..907de0a6650 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as32 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as32 @@ -928,13 +928,27 @@ fun main(args: Array) { /* There is no jps in AS testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { testClass { - model("incremental/multiModule", extension = null, excludeParentDirs = true) + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, recursive = false) model("incremental/withJava", extension = null, excludeParentDirs = true) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true) } + actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule") + + testClass { + model("incremental/multiModule/common", extension = null, excludeParentDirs = true) + } + + testClass { + model( + "incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true, + testClassName = "MultiplatformMultiModule", recursive = true + ) + } + testClass { model("incremental/lookupTracker/jvm", extension = null, recursive = false) } 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 c5b274ed3e0..c906853878a 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 @@ -428,11 +428,15 @@ abstract class AbstractIncrementalJpsTest( moduleNames = nameToModule.keys } - AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject) - AbstractKotlinJpsBuildTestCase.addKotlinTestDependency(myProject) + + configureDependencies() return moduleNames } + protected open fun configureDependencies() { + AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject) + AbstractKotlinJpsBuildTestCase.addKotlinTestDependency(myProject) + } protected open fun preProcessSources(srcDir: File) { } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173 index 05f7fe8aa5c..b12ab12dab7 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173 +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173 @@ -427,11 +427,15 @@ abstract class AbstractIncrementalJpsTest( moduleNames = nameToModule.keys } - AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject) - AbstractKotlinJpsBuildTestCase.addKotlinTestDependency(myProject) + + configureDependencies() return moduleNames } + protected open fun configureDependencies() { + AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject) + AbstractKotlinJpsBuildTestCase.addKotlinTestDependency(myProject) + } protected open fun preProcessSources(srcDir: File) { } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt new file mode 100644 index 00000000000..cd5b8c5582e --- /dev/null +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt @@ -0,0 +1,41 @@ +/* + * Copyright 2010-2018 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.config.IncrementalCompilation +import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder +import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder.Companion.JS_JPS_LOG +import java.io.File + +abstract class AbstractIncrementalJsJpsTest : AbstractIncrementalJpsTest() { + private var isICEnabledForJsBackup: Boolean = false + + override fun setUp() { + super.setUp() + isICEnabledForJsBackup = IncrementalCompilation.isEnabledForJs() + IncrementalCompilation.setIsEnabledForJs(true) + } + + override fun tearDown() { + IncrementalCompilation.setIsEnabledForJs(isICEnabledForJsBackup) + super.tearDown() + } + + override fun configureDependencies() { + AbstractKotlinJpsBuildTestCase.addKotlinJavaScriptStdlibDependency(myProject) + } + + override val buildLogFinder: BuildLogFinder + get() = super.buildLogFinder.copy(isJsEnabled = true) + + override fun doTest(testDataPath: String) { + val buildLogFile = File(testDataPath).resolve(JS_JPS_LOG) + if (!buildLogFile.exists()) { + buildLogFile.writeText("JPS JS LOG PLACEHOLDER") + } + super.doTest(testDataPath) + } +} diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index e49aa057c6b..32e9fe6fbdc 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -75,6 +75,10 @@ public abstract class AbstractKotlinJpsBuildTestCase extends BaseKotlinJpsBuildT return addDependency("KotlinJavaScript", PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()); } + static JpsLibrary addKotlinJavaScriptStdlibDependency(@NotNull JpsProject project) { + return addDependency(project,"KotlinJavaScript", PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()); + } + static JpsLibrary addKotlinStdlibDependency(@NotNull JpsProject project) { return addKotlinStdlibDependency(project.getModules(), false); } 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/IncrementalJpsTestGenerated.java index 00b853c77c4..a10f7e070d4 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/IncrementalJpsTestGenerated.java @@ -19,224 +19,134 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { - @TestMetadata("jps-plugin/testData/incremental/multiModule") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultiModule extends AbstractIncrementalJpsTest { + public static class Common extends AbstractIncrementalJpsTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); } - public void testAllFilesPresentInMultiModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - - @TestMetadata("circular") - public void testCircular() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/circular/"); - } - - @TestMetadata("circularDependencyClasses") - public void testCircularDependencyClasses() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); - } - - @TestMetadata("circularDependencySamePackageUnchanged") - public void testCircularDependencySamePackageUnchanged() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); - } - - @TestMetadata("circularDependencyTopLevelFunctions") - public void testCircularDependencyTopLevelFunctions() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); - } - - @TestMetadata("circularDependencyWithAccessToInternal") - public void testCircularDependencyWithAccessToInternal() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/"); + public void testAllFilesPresentInCommon() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("classAdded") public void testClassAdded() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/classAdded/"); + runTest("jps-plugin/testData/incremental/multiModule/common/classAdded/"); } @TestMetadata("classRemoved") public void testClassRemoved() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/classRemoved/"); + runTest("jps-plugin/testData/incremental/multiModule/common/classRemoved/"); } @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); + runTest("jps-plugin/testData/incremental/multiModule/common/constantValueChanged/"); } @TestMetadata("copyFileToAnotherModule") public void testCopyFileToAnotherModule() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/"); + runTest("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/"); } @TestMetadata("defaultArgumentInConstructorRemoved") public void testDefaultArgumentInConstructorRemoved() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/"); + runTest("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/"); } @TestMetadata("defaultParameterAdded") public void testDefaultParameterAdded() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/defaultParameterAdded/"); + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/"); } @TestMetadata("defaultParameterAddedForTopLevelFun") public void testDefaultParameterAddedForTopLevelFun() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/"); + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/"); } @TestMetadata("defaultParameterRemoved") public void testDefaultParameterRemoved() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/"); + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/"); } @TestMetadata("defaultParameterRemovedForTopLevelFun") public void testDefaultParameterRemovedForTopLevelFun() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/"); + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/"); } @TestMetadata("defaultValueInConstructorRemoved") public void testDefaultValueInConstructorRemoved() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/"); + runTest("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/"); } @TestMetadata("duplicatedClass") public void testDuplicatedClass() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/duplicatedClass/"); + runTest("jps-plugin/testData/incremental/multiModule/common/duplicatedClass/"); } @TestMetadata("exportedDependency") public void testExportedDependency() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/exportedDependency/"); + runTest("jps-plugin/testData/incremental/multiModule/common/exportedDependency/"); } @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); + runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/"); } @TestMetadata("inlineFunctionTwoPackageParts") public void testInlineFunctionTwoPackageParts() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); + runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/"); } @TestMetadata("moveFileToAnotherModule") public void testMoveFileToAnotherModule() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/"); + runTest("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/"); } @TestMetadata("simple") public void testSimple() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/simple/"); + runTest("jps-plugin/testData/incremental/multiModule/common/simple/"); } @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/simpleDependency/"); + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependency/"); } @TestMetadata("simpleDependencyErrorOnAccessToInternal1") public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/"); } @TestMetadata("simpleDependencyErrorOnAccessToInternal2") public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/"); } @TestMetadata("simpleDependencyUnchanged") public void testSimpleDependencyUnchanged() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/"); } @TestMetadata("transitiveDependency") public void testTransitiveDependency() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); + runTest("jps-plugin/testData/incremental/multiModule/common/transitiveDependency/"); } @TestMetadata("transitiveInlining") public void testTransitiveInlining() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); + runTest("jps-plugin/testData/incremental/multiModule/common/transitiveInlining/"); } @TestMetadata("twoDependants") public void testTwoDependants() throws Exception { - runTest("jps-plugin/testData/incremental/multiModule/twoDependants/"); + runTest("jps-plugin/testData/incremental/multiModule/common/twoDependants/"); } - @TestMetadata("jps-plugin/testData/incremental/multiModule/circular") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Circular extends AbstractIncrementalJpsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInCircular() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/circular"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - } - - @TestMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencyClasses extends AbstractIncrementalJpsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInCircularDependencyClasses() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/circularDependencyClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - } - - @TestMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencySamePackageUnchanged extends AbstractIncrementalJpsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInCircularDependencySamePackageUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - } - - @TestMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencyTopLevelFunctions extends AbstractIncrementalJpsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInCircularDependencyTopLevelFunctions() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - } - - @TestMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependencyWithAccessToInternal extends AbstractIncrementalJpsTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInCircularDependencyWithAccessToInternal() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); - } - } - - @TestMetadata("jps-plugin/testData/incremental/multiModule/classAdded") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ClassAdded extends AbstractIncrementalJpsTest { @@ -245,11 +155,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInClassAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/classAdded"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/classRemoved") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ClassRemoved extends AbstractIncrementalJpsTest { @@ -258,11 +168,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInClassRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/classRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/constantValueChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ConstantValueChanged extends AbstractIncrementalJpsTest { @@ -271,11 +181,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInConstantValueChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class CopyFileToAnotherModule extends AbstractIncrementalJpsTest { @@ -284,11 +194,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJpsTest { @@ -297,11 +207,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAdded") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterAdded extends AbstractIncrementalJpsTest { @@ -310,11 +220,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDefaultParameterAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJpsTest { @@ -323,11 +233,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterRemoved") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterRemoved extends AbstractIncrementalJpsTest { @@ -336,11 +246,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDefaultParameterRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJpsTest { @@ -349,11 +259,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJpsTest { @@ -362,11 +272,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/duplicatedClass") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/duplicatedClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DuplicatedClass extends AbstractIncrementalJpsTest { @@ -375,11 +285,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInDuplicatedClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/exportedDependency") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/exportedDependency") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ExportedDependency extends AbstractIncrementalJpsTest { @@ -388,11 +298,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInExportedDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/exportedDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunctionInlined extends AbstractIncrementalJpsTest { @@ -401,11 +311,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInInlineFunctionInlined() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJpsTest { @@ -414,11 +324,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class MoveFileToAnotherModule extends AbstractIncrementalJpsTest { @@ -427,11 +337,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/simple") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simple") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Simple extends AbstractIncrementalJpsTest { @@ -440,11 +350,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInSimple() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/simple"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependency") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependency extends AbstractIncrementalJpsTest { @@ -453,11 +363,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInSimpleDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/simpleDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJpsTest { @@ -466,11 +376,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJpsTest { @@ -479,11 +389,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependencyUnchanged extends AbstractIncrementalJpsTest { @@ -492,11 +402,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveDependency") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TransitiveDependency extends AbstractIncrementalJpsTest { @@ -505,11 +415,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInTransitiveDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveInlining") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TransitiveInlining extends AbstractIncrementalJpsTest { @@ -518,11 +428,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInTransitiveInlining() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } - @TestMetadata("jps-plugin/testData/incremental/multiModule/twoDependants") + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/twoDependants") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TwoDependants extends AbstractIncrementalJpsTest { @@ -531,7 +441,110 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInTwoDependants() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/twoDependants"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Jvm extends AbstractIncrementalJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInJvm() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + + @TestMetadata("circular") + public void testCircular() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/jvm/circular/"); + } + + @TestMetadata("circularDependencyClasses") + public void testCircularDependencyClasses() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/"); + } + + @TestMetadata("circularDependencySamePackageUnchanged") + public void testCircularDependencySamePackageUnchanged() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/"); + } + + @TestMetadata("circularDependencyTopLevelFunctions") + public void testCircularDependencyTopLevelFunctions() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/"); + } + + @TestMetadata("circularDependencyWithAccessToInternal") + public void testCircularDependencyWithAccessToInternal() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/"); + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circular") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Circular extends AbstractIncrementalJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCircular() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circular"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class CircularDependencyClasses extends AbstractIncrementalJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCircularDependencyClasses() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class CircularDependencySamePackageUnchanged extends AbstractIncrementalJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCircularDependencySamePackageUnchanged() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class CircularDependencyTopLevelFunctions extends AbstractIncrementalJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCircularDependencyTopLevelFunctions() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class CircularDependencyWithAccessToInternal extends AbstractIncrementalJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCircularDependencyWithAccessToInternal() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } } } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java new file mode 100644 index 00000000000..770a9e50031 --- /dev/null +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java @@ -0,0 +1,445 @@ +/* + * Copyright 2010-2018 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 com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/multiModule/common") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCommon() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + + @TestMetadata("classAdded") + public void testClassAdded() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/classAdded/"); + } + + @TestMetadata("classRemoved") + public void testClassRemoved() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/classRemoved/"); + } + + @TestMetadata("constantValueChanged") + public void testConstantValueChanged() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/constantValueChanged/"); + } + + @TestMetadata("copyFileToAnotherModule") + public void testCopyFileToAnotherModule() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/"); + } + + @TestMetadata("defaultArgumentInConstructorRemoved") + public void testDefaultArgumentInConstructorRemoved() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/"); + } + + @TestMetadata("defaultParameterAdded") + public void testDefaultParameterAdded() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/"); + } + + @TestMetadata("defaultParameterAddedForTopLevelFun") + public void testDefaultParameterAddedForTopLevelFun() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/"); + } + + @TestMetadata("defaultParameterRemoved") + public void testDefaultParameterRemoved() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/"); + } + + @TestMetadata("defaultParameterRemovedForTopLevelFun") + public void testDefaultParameterRemovedForTopLevelFun() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/"); + } + + @TestMetadata("defaultValueInConstructorRemoved") + public void testDefaultValueInConstructorRemoved() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/"); + } + + @TestMetadata("duplicatedClass") + public void testDuplicatedClass() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/duplicatedClass/"); + } + + @TestMetadata("exportedDependency") + public void testExportedDependency() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/exportedDependency/"); + } + + @TestMetadata("inlineFunctionInlined") + public void testInlineFunctionInlined() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/"); + } + + @TestMetadata("inlineFunctionTwoPackageParts") + public void testInlineFunctionTwoPackageParts() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/"); + } + + @TestMetadata("moveFileToAnotherModule") + public void testMoveFileToAnotherModule() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/"); + } + + @TestMetadata("simple") + public void testSimple() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/simple/"); + } + + @TestMetadata("simpleDependency") + public void testSimpleDependency() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependency/"); + } + + @TestMetadata("simpleDependencyErrorOnAccessToInternal1") + public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/"); + } + + @TestMetadata("simpleDependencyErrorOnAccessToInternal2") + public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/"); + } + + @TestMetadata("simpleDependencyUnchanged") + public void testSimpleDependencyUnchanged() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/"); + } + + @TestMetadata("transitiveDependency") + public void testTransitiveDependency() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/transitiveDependency/"); + } + + @TestMetadata("transitiveInlining") + public void testTransitiveInlining() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/transitiveInlining/"); + } + + @TestMetadata("twoDependants") + public void testTwoDependants() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/common/twoDependants/"); + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classAdded") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassAdded extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInClassAdded() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/classRemoved") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassRemoved extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInClassRemoved() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/constantValueChanged") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ConstantValueChanged extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInConstantValueChanged() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class CopyFileToAnotherModule extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DefaultParameterAdded extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDefaultParameterAdded() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DefaultParameterRemoved extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDefaultParameterRemoved() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/duplicatedClass") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DuplicatedClass extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInDuplicatedClass() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/exportedDependency") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ExportedDependency extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInExportedDependency() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineFunctionInlined extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInInlineFunctionInlined() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class MoveFileToAnotherModule extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simple") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Simple extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInSimple() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependency") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SimpleDependency extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInSimpleDependency() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SimpleDependencyUnchanged extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveDependency") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TransitiveDependency extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInTransitiveDependency() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/transitiveInlining") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TransitiveInlining extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInTransitiveInlining() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } + + @TestMetadata("jps-plugin/testData/incremental/multiModule/common/twoDependants") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class TwoDependants extends AbstractIncrementalJsJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + } + + public void testAllFilesPresentInTwoDependants() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + } +} diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/build.log b/jps-plugin/testData/incremental/multiModule/common/classAdded/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/build.log rename to jps-plugin/testData/incremental/multiModule/common/classAdded/build.log diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/classAdded/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log new file mode 100644 index 00000000000..3df78bc0f18 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log @@ -0,0 +1,51 @@ +================ Step #1 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/foo/foo.kjsm + out/production/module2/module2/use/use.kjsm +End of files +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: foo + +================ Step #2 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/A.kt + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_B.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_B.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_B.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_B.kt diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_createA.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_createA.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createA.kt diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_createB.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createB.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_createB.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createB.kt diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_other.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_other.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt.new.2 b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/module2_useBbar.kt b/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classAdded/module2_useBbar.kt rename to jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/build.log b/jps-plugin/testData/incremental/multiModule/common/classRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/build.log rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/build.log diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log new file mode 100644 index 00000000000..1f4dd7ed363 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log @@ -0,0 +1,61 @@ +================ Step #1 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/foo/foo.kjsm +End of files +Building module2 +Marked as dirty by Kotlin: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +Cleaning output files: + out/production/module2/module2/use/use.kjsm +End of files +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: boo + +================ Step #2 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #3 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt.delete.1 b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt.delete.1 rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1 diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_B.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_B.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_B.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_B.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createA.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_createA.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createA.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createB.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createB.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_createB.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createB.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_failCompilation.kt.new.4 b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_failCompilation.kt.new.4 rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4 diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_other.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_other.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt.new.2 b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useBbar.kt b/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/classRemoved/module2_useBbar.kt rename to jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log rename to jps-plugin/testData/incremental/multiModule/common/constantValueChanged/build.log diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/constantValueChanged/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log new file mode 100644 index 00000000000..4a577ac7aaa --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/test/test.kjsm +End of files +Compiling files: + module1/src/const.kt +End of files +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt rename to jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new rename to jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log new file mode 100644 index 00000000000..52437a4d8b7 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log @@ -0,0 +1,39 @@ +================ Step #1 ================= + +Building module1 +Compiling files: + module1/src/b.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt + module2/src/useClassB.kt + module2/src/useFunB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/b.kt + module2/src/useClassB.kt + module2/src/useFunB.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Building module1 +Compiling files: + module1/src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_b.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_b.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_failCompilation.kt.new.2 b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_failCompilation.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassA.kt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassA.kt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassB.kt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassB.kt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunA.kt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunA.kt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunB.kt b/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunB.kt rename to jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log new file mode 100644 index 00000000000..e2af6fd1caf --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log @@ -0,0 +1,44 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/foo/foo.kjsm +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/createADefault.kt + module2/src/createANonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/foo/foo.kjsm +End of files +Compiling files: + module2/src/createADefault.kt + module2/src/createANonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/createADefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createADefault.kt b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createADefault.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 b/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 rename to jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/build.log diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAdded/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log new file mode 100644 index 00000000000..96900e7df43 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log new file mode 100644 index 00000000000..96900e7df43 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/build.log diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log new file mode 100644 index 00000000000..96900e7df43 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log new file mode 100644 index 00000000000..96900e7df43 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log new file mode 100644 index 00000000000..e2fa2d0c657 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log @@ -0,0 +1,44 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/foo/foo.kjsm +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/createADefault.kt + module2/src/createANonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/foo/foo.kjsm +End of files +Compiling files: + module2/src/createADefault.kt + module2/src/createANonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter 'x' + +================ Step #2 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/createANonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createANonDefault.kt b/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/module2_createANonDefault.kt rename to jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/build.log b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/build.log rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/build.log diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log new file mode 100644 index 00000000000..cee3a3fce96 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log @@ -0,0 +1,17 @@ +================ Step #1 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/root-package.kjsm +End of files +Compiling files: + module2/src/useA.kt + module2/src/useUtils.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_other1.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_other1.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_utils.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_utils.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_A.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_A.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_other2.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_other2.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt.touch b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt.touch rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt.touch b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt.touch rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch diff --git a/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_utils.kt b/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_utils.kt rename to jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/build.log b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/build.log rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/build.log diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log new file mode 100644 index 00000000000..816dfac52a2 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log @@ -0,0 +1,83 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/foo/foo.kjsm +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt + module4/src/importAGrandChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/foo/foo.kjsm +End of files +Compiling files: + module2/src/AChild.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/foo/foo.kjsm +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt + module4/src/importAGrandChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/module3.js + out/production/module3/module3.meta.js + out/production/module3/module3/foo/foo.kjsm +End of files +Compiling files: + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt +End of files +Exit code: OK +------------------------------------------ +Building module4 +Cleaning output files: + out/production/module4/module4.js + out/production/module4/module4.meta.js +End of files +Compiling files: + module4/src/importAGrandChild.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.2 b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module1_A.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module2_AChild.kt b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module2_AChild.kt rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module3_AGrandChild.kt b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module3_AGrandChild.kt rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module3_importAGrandChild.kt b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module3_importAGrandChild.kt rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/module4_importAGrandChild.kt b/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/exportedDependency/module4_importAGrandChild.kt rename to jps-plugin/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/build.log diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log new file mode 100644 index 00000000000..d8abf06e1d2 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/inline/inline.kjsm +End of files +Compiling files: + module1/src/inline.kt +End of files +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt.new b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt.new rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_other.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_other.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module2_usage.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module2_usage.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log new file mode 100644 index 00000000000..b847314a1f3 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log @@ -0,0 +1,57 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/inline/inline.kjsm +End of files +Compiling files: + module1/src/inlineF.kt +End of files +Marked as dirty by Kotlin: + module2/src/usageF.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usageF.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/inline/inline.kjsm +End of files +Compiling files: + module1/src/inlineG.kt +End of files +Marked as dirty by Kotlin: + module2/src/usageG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/usageG.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_other.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_other.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt b/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt rename to jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log new file mode 100644 index 00000000000..9a94872f7fb --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log @@ -0,0 +1,30 @@ +================ Step #1 ================= + +Building module1 +Compiling files: + module1/src/b.kt +End of files +Marked as dirty by Kotlin: + module2/src/useClassB.kt + module2/src/useFunB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Building module2 +Marked as dirty by Kotlin: + module2/src/useClassB.kt +Cleaning output files: + out/production/module2/module2/usage/usage.kjsm +End of files +Compiling files: + module2/src/useClassB.kt + module2/src/useFunB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_b.kt.new b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_b.kt.new rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt.delete b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt.delete rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassA.kt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassA.kt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassB.kt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassB.kt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunA.kt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunA.kt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunB.kt b/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunB.kt rename to jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt diff --git a/jps-plugin/testData/incremental/multiModule/simple/build.log b/jps-plugin/testData/incremental/multiModule/common/simple/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/build.log rename to jps-plugin/testData/incremental/multiModule/common/simple/build.log diff --git a/jps-plugin/testData/incremental/multiModule/simple/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/simple/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/simple/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log new file mode 100644 index 00000000000..a2a9f9051e7 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log @@ -0,0 +1,72 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/foo/foo.kjsm +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/foo/foo.kjsm +End of files +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A +Cannot access 'A': it is private in file + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/foo/foo.kjsm +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/module3.js + out/production/module3/module3.meta.js +End of files +Compiling files: + module3/src/importAChild.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/simple/module1_A.kt b/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.2 b/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/module1_A.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/simple/module2_AChild.kt b/jps-plugin/testData/incremental/multiModule/common/simple/module2_AChild.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/module2_AChild.kt rename to jps-plugin/testData/incremental/multiModule/common/simple/module2_AChild.kt diff --git a/jps-plugin/testData/incremental/multiModule/simple/module2_importA.kt b/jps-plugin/testData/incremental/multiModule/common/simple/module2_importA.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/module2_importA.kt rename to jps-plugin/testData/incremental/multiModule/common/simple/module2_importA.kt diff --git a/jps-plugin/testData/incremental/multiModule/simple/module3_importAChild.kt b/jps-plugin/testData/incremental/multiModule/common/simple/module3_importAChild.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simple/module3_importAChild.kt rename to jps-plugin/testData/incremental/multiModule/common/simple/module3_importAChild.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependency/build.log rename to jps-plugin/testData/incremental/multiModule/common/simpleDependency/build.log diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependency/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependency/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log new file mode 100644 index 00000000000..2301a169d23 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Compiling files: + module2/src/b.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependency/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_c.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_c.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependency/module2_c.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log new file mode 100644 index 00000000000..654c739152c --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log @@ -0,0 +1,37 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Compiling files: + module2/src/b.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' +'public' function exposes its 'internal' parameter type A +Cannot access 'A': it is internal in 'a' +Cannot access 'a': it is internal in 'a' \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log new file mode 100644 index 00000000000..52ab460ecb7 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log @@ -0,0 +1,33 @@ +================ Step #1 ================= + +Building module1 +Marked as dirty by Kotlin: + module1/src/a.kt +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Exit code: OK +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Compiling files: + module2/src/b.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'InternalFileAnnotation': it is internal in 'a' +Cannot access 'InternalFileAnnotation': it is internal in 'a' +Cannot access 'InternalClassAnnotation': it is internal in 'a' +Cannot access 'InternalClassAnnotation': it is internal in 'a' +Unresolved reference: InternalA +Unresolved reference: internalA \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log new file mode 100644 index 00000000000..6468530f4e6 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log @@ -0,0 +1,16 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Exit code: OK +------------------------------------------ +Building module2 +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log rename to jps-plugin/testData/incremental/multiModule/common/transitiveDependency/build.log diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveDependency/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log new file mode 100644 index 00000000000..13f114657c2 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log @@ -0,0 +1,31 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Compiling files: + module2/src/b.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveDependency/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/module3_c.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveDependency/module3_c.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/build.log diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log new file mode 100644 index 00000000000..e3aee077e21 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log @@ -0,0 +1,43 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Compiling files: + module2/src/b.kt +End of files +Marked as dirty by Kotlin: + module3/src/c.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/module3.js + out/production/module3/module3.meta.js + out/production/module3/module3/c/c.kjsm +End of files +Compiling files: + module3/src/c.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_other.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_other.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/module3_c.kt b/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/transitiveInlining/module3_c.kt rename to jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/common/twoDependants/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/twoDependants/build.log rename to jps-plugin/testData/incremental/multiModule/common/twoDependants/build.log diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/dependencies.txt b/jps-plugin/testData/incremental/multiModule/common/twoDependants/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/twoDependants/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/common/twoDependants/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log b/jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log new file mode 100644 index 00000000000..81b113cf293 --- /dev/null +++ b/jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/module1.js + out/production/module1/module1.meta.js + out/production/module1/module1/a/a.kjsm +End of files +Compiling files: + module1/src/a.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt + module3/src/c.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/module2.js + out/production/module2/module2.meta.js + out/production/module2/module2/b/b.kjsm +End of files +Compiling files: + module2/src/b.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/module3.js + out/production/module3/module3.meta.js + out/production/module3/module3/c/c.kjsm +End of files +Compiling files: + module3/src/c.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt b/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/module2_b.kt b/jps-plugin/testData/incremental/multiModule/common/twoDependants/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/twoDependants/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/common/twoDependants/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/module3_c.kt b/jps-plugin/testData/incremental/multiModule/common/twoDependants/module3_c.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/twoDependants/module3_c.kt rename to jps-plugin/testData/incremental/multiModule/common/twoDependants/module3_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/build.log b/jps-plugin/testData/incremental/multiModule/jvm/circular/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/build.log rename to jps-plugin/testData/incremental/multiModule/jvm/circular/build.log diff --git a/jps-plugin/testData/incremental/multiModule/circular/dependencies.txt b/jps-plugin/testData/incremental/multiModule/jvm/circular/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/circular/module1_A.kt b/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module1_A.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.1 b/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.1 rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1 diff --git a/jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.2 b/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module1_A.kt.new.2 rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2 diff --git a/jps-plugin/testData/incremental/multiModule/circular/module1_D.kt b/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_D.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module1_D.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module1_D.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/module2_B.kt b/jps-plugin/testData/incremental/multiModule/jvm/circular/module2_B.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module2_B.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module2_B.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/module3_C.kt b/jps-plugin/testData/incremental/multiModule/jvm/circular/module3_C.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module3_C.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module3_C.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/module4_E.kt b/jps-plugin/testData/incremental/multiModule/jvm/circular/module4_E.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module4_E.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module4_E.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/module5_F.kt b/jps-plugin/testData/incremental/multiModule/jvm/circular/module5_F.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circular/module5_F.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circular/module5_F.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/dependencies.txt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyClasses/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module1_a.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt.new b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt.new rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/dependencies.txt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module1_a.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt.new b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt.new rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/dependencies.txt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt.new b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt.new rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c1.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c1.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt.new b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new similarity index 100% rename from jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt.new rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt b/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt