diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index b07c9630996..295fb525744 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -419,8 +419,8 @@ abstract class AbstractIncrementalJpsTest( moduleNames = nameToModule.keys } - AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) - AbstractKotlinJpsBuildTestCase.addKotlinTestRuntimeDependency(myProject) + AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject) + AbstractKotlinJpsBuildTestCase.addKotlinTestDependency(myProject) return moduleNames } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 64001e55a56..fa36e00f57b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.builders.JpsBuildTestCase; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsModuleRootModificationUtil; import org.jetbrains.jps.model.JpsProject; @@ -65,39 +64,35 @@ public abstract class AbstractKotlinJpsBuildTestCase extends BaseKotlinJpsBuildT } protected JpsLibrary addKotlinMockRuntimeDependency() { - return addDependency(JpsJavaDependencyScope.COMPILE, myProject.getModules(), false, "kotlin-mock-runtime", ForTestCompileRuntime.mockRuntimeJarForTests()); + return addDependency("kotlin-mock-runtime", ForTestCompileRuntime.mockRuntimeJarForTests()); } - protected JpsLibrary addKotlinRuntimeDependency() { - return addKotlinRuntimeDependency(myProject); + protected JpsLibrary addKotlinStdlibDependency() { + return addKotlinStdlibDependency(myProject); } protected JpsLibrary addKotlinJavaScriptStdlibDependency() { - return addKotlinJavaScriptStdlibDependency(myProject); + return addDependency("KotlinJavaScript", PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()); } - protected JpsLibrary addKotlinJavaScriptDependency(String libraryName, File libraryFile) { - return addDependency(JpsJavaDependencyScope.COMPILE, myProject.getModules(), false, libraryName, libraryFile); + static JpsLibrary addKotlinStdlibDependency(@NotNull JpsProject project) { + return addKotlinStdlibDependency(project.getModules(), false); } - static JpsLibrary addKotlinRuntimeDependency(@NotNull JpsProject project) { - return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); + static JpsLibrary addKotlinTestDependency(@NotNull JpsProject project) { + return addDependency(project, "kotlin-test", PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath()); } - static JpsLibrary addKotlinTestRuntimeDependency(@NotNull JpsProject project) { - return addDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false, "kotlin-test", PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath()); + protected static JpsLibrary addKotlinStdlibDependency(@NotNull Collection modules, boolean exported) { + return addDependency(JpsJavaDependencyScope.COMPILE, modules, exported, "kotlin-stdlib", PathUtil.getKotlinPathsForDistDirectory().getStdlibPath()); } - static JpsLibrary addKotlinJavaScriptStdlibDependency(@NotNull JpsProject project) { - return addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); + protected JpsLibrary addDependency(@NotNull String libraryName, @NotNull File libraryFile) { + return addDependency(myProject, libraryName, libraryFile); } - protected static JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { - return addDependency(type, modules, exported, "kotlin-runtime", PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()); - } - - protected static JpsLibrary addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { - return addDependency(type, modules, exported, "KotlinJavaScript", PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()); + private static JpsLibrary addDependency(@NotNull JpsProject project, @NotNull String libraryName, @NotNull File libraryFile) { + return addDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false, libraryName, libraryFile); } protected static JpsLibrary addDependency(JpsJavaDependencyScope type, Collection modules, boolean exported, String libraryName, File... file) { diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 468a554ef80..daee35d4491 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build import com.google.common.collect.Lists -import com.intellij.openapi.util.Condition import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.openapi.util.io.FileUtilRt @@ -26,7 +25,6 @@ import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.testFramework.LightVirtualFile import com.intellij.testFramework.UsefulTestCase import com.intellij.util.ArrayUtil -import com.intellij.util.containers.ContainerUtil import com.intellij.util.io.URLUtil import com.intellij.util.io.ZipUtil import org.jetbrains.jps.ModuleChunk @@ -244,7 +242,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { when (libraryDependency) { NONE -> {} JVM_MOCK_RUNTIME -> addKotlinMockRuntimeDependency() - JVM_FULL_RUNTIME -> addKotlinRuntimeDependency() + JVM_FULL_RUNTIME -> addKotlinStdlibDependency() JS_STDLIB -> addKotlinJavaScriptStdlibDependency() } } @@ -262,7 +260,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun doTestWithKotlinJavaScriptLibrary() { initProject(JS_STDLIB) createKotlinJavaScriptLibraryArchive() - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) buildAllModules().assertSuccessful() } @@ -326,7 +324,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary() { initProject() createKotlinJavaScriptLibraryArchive() - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) addKotlinJavaScriptStdlibDependency() buildAllModules().assertSuccessful() } @@ -342,7 +340,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { throw IllegalStateException(ex.message) } - addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir) + addDependency("KotlinJavaScript", jslibDir) buildAllModules().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) @@ -351,7 +349,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { initProject(JS_STDLIB) - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) buildAllModules().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) @@ -382,7 +380,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testKotlinJavaScriptProjectWithLibraryAndErrors() { initProject(JS_STDLIB) createKotlinJavaScriptLibraryArchive() - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) buildAllModules().assertFailed() assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) @@ -673,7 +671,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) - addKotlinRuntimeDependency() + addKotlinStdlibDependency() val result = buildAllModules() result.assertSuccessful() @@ -717,11 +715,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testReexportedDependency() { initProject() - AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, ContainerUtil.filter(myProject.modules, object : Condition { - override fun value(module: JpsModule): Boolean { - return module.name == "module2" - } - }), true) + AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject.modules.filter { module -> module.name == "module2" }, true) buildAllModules().assertSuccessful() } @@ -948,14 +942,14 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") - addKotlinRuntimeDependency() + addKotlinStdlibDependency() buildAllModules().assertSuccessful() } fun testCustomDestination() { loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") - addKotlinRuntimeDependency() + addKotlinStdlibDependency() buildAllModules().apply { assertSuccessful() diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index c0272ec8462..6b5f8179062 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -60,7 +60,7 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { b.dependenciesList.addModuleDependency(a) ).isExported = false - addKotlinRuntimeDependency() + addKotlinStdlibDependency() rebuildAllModules() } diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java index 410af784abe..acea57d742a 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java @@ -104,7 +104,7 @@ public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { private void initProject() { addJdk(JDK_NAME); loadProject(workDir.getAbsolutePath()); - addKotlinRuntimeDependency(); + addKotlinStdlibDependency(); } @Override