From 7f5d87ea17eaf13d1d12c9656e4e230dab4da326 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 26 Apr 2017 19:26:51 +0300 Subject: [PATCH] Rename PathUtil.getJdkClassesRoots to avoid confusion Two of these methods return roots given a path to the JRE, and the third one returns roots given a path to the _JDK_. --- .../jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 2 +- .../kotlin/daemon/KotlinRemoteReplService.kt | 2 +- .../kotlin/test/KotlinTestUtils.java | 4 +-- ...solveDescriptorsFromExternalLibraries.java | 2 +- .../org/jetbrains/kotlin/utils/PathUtil.java | 6 ++--- ...ractJavaToKotlinConverterForWebDemoTest.kt | 2 +- .../AbstractKotlinKapt3IntegrationTest.kt | 2 +- .../kapt3/test/AbstractKotlinKapt3Test.kt | 2 +- .../tests/AbstractKotlinUastTest.kt | 25 +++++++------------ 9 files changed, 20 insertions(+), 27 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 90928ad328b..612f27dff18 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -354,7 +354,7 @@ class K2JVMCompiler : CLICompiler() { configuration.addJvmClasspathRoots(classesRoots) } else { - configuration.addJvmClasspathRoots(PathUtil.getJdkClassesRoots()) + configuration.addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre()) } } else { diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinRemoteReplService.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinRemoteReplService.kt index ab32141af01..8fb349ff820 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinRemoteReplService.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinRemoteReplService.kt @@ -50,7 +50,7 @@ open class KotlinJvmReplService( ) : ReplCompileAction, ReplCheckAction, CreateReplStageStateAction { protected val configuration = CompilerConfiguration().apply { - addJvmClasspathRoots(PathUtil.getJdkClassesRoots()) + addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre()) addJvmClasspathRoots(PathUtil.getKotlinPathsForCompiler().let { listOf(it.stdlibPath, it.reflectPath, it.scriptRuntimePath) }) addJvmClasspathRoots(templateClasspath) put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script") diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index f897993e3ae..30311527209 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -459,10 +459,10 @@ public class KotlinTestUtils { JvmContentRootsKt.addJvmClasspathRoot(configuration, findAndroidApiJar()); } else if (jdkKind == TestJdkKind.FULL_JDK_6) { - JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRoots(getJre6Home())); + JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromJre(getJre6Home())); } else { - JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRoots()); + JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromCurrentJre()); } if (configurationKind.getWithRuntime()) { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 469e08f33c7..d946c7e1c50 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -146,7 +146,7 @@ public class ResolveDescriptorsFromExternalLibraries { @NotNull private static File findRtJar() { - List roots = PathUtil.getJdkClassesRoots(); + List roots = PathUtil.getJdkClassesRootsFromCurrentJre(); for (File root : roots) { if (root.getName().equals("rt.jar") || root.getName().equals("classes.jar")) { return root; diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java index 31de8e900a9..330960bdc2e 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java +++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java @@ -159,12 +159,12 @@ public class PathUtil { } @NotNull - public static List getJdkClassesRoots() { - return getJdkClassesRoots(System.getProperty("java.home")); + public static List getJdkClassesRootsFromCurrentJre() { + return getJdkClassesRootsFromJre(System.getProperty("java.home")); } @NotNull - public static List getJdkClassesRoots(@NotNull String javaHome) { + public static List getJdkClassesRootsFromJre(@NotNull String javaHome) { return JavaSdkUtil.getJdkClassesRoots(new File(javaHome), true); } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt index 1fb0a122ceb..d460b160e60 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt @@ -84,7 +84,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { applicationEnvironment.application.registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java) - for (root in PathUtil.getJdkClassesRoots()) { + for (root in PathUtil.getJdkClassesRootsFromCurrentJre()) { javaCoreEnvironment.addJarToClassPath(root) } val annotations: File? = findAnnotations() diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt index c9df9245715..657f4849ad6 100644 --- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt +++ b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt @@ -150,7 +150,7 @@ abstract class AbstractKotlinKapt3IntegrationTest : CodegenTestCase() { options: Map, stubsOutputDir: File, incrementalDataOutputDir: File - ) : AbstractKapt3Extension(PathUtil.getJdkClassesRoots() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath, + ) : AbstractKapt3Extension(PathUtil.getJdkClassesRootsFromCurrentJre() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath, emptyList(), javaSourceRoots, outputDir, outputDir, stubsOutputDir, incrementalDataOutputDir, options, emptyMap(), "", true, System.currentTimeMillis(), KaptLogger(true), correctErrorTypes = true diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt index fbe0693e02b..dec1ced9e0e 100644 --- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt +++ b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt @@ -118,7 +118,7 @@ abstract class AbstractKotlinKaptContextTest : AbstractKotlinKapt3Test() { val sourceOutputDir = Files.createTempDirectory("kaptRunner").toFile() try { kaptRunner.doAnnotationProcessing(emptyList(), listOf(JavaKaptContextTest.simpleProcessor()), - compileClasspath = PathUtil.getJdkClassesRoots() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath, + compileClasspath = PathUtil.getJdkClassesRootsFromCurrentJre() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath, annotationProcessingClasspath = emptyList(), annotationProcessors = "", sourcesOutputDir = sourceOutputDir, classesOutputDir = sourceOutputDir, additionalSources = compilationUnits, withJdk = true) diff --git a/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt b/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt index 6a434f5493c..41b476e99b3 100644 --- a/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt +++ b/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt @@ -15,15 +15,15 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot -import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.addKotlinSourceRoot import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase -import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.uast.UastLanguagePlugin import org.jetbrains.uast.evaluation.UEvaluatorExtension import org.jetbrains.uast.kotlin.KotlinUastBindingContextProviderService @@ -106,21 +106,14 @@ abstract class AbstractKotlinUastTest : AbstractUastTest() { } private fun createKotlinCompilerConfiguration(sourceFile: File): CompilerConfiguration { - val configuration = CompilerConfiguration() - configuration.addJvmClasspathRoots(PathUtil.getJdkClassesRoots()) + return KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK).apply { + addKotlinSourceRoot(sourceFile.canonicalPath) - val kotlinLibsDir = File("dist/kotlinc/lib") - configuration.addJvmClasspathRoot(File(kotlinLibsDir, "kotlin-runtime.jar")) - configuration.addJvmClasspathRoot(File(kotlinLibsDir, "kotlin-reflect.jar")) + val messageCollector = PrintingMessageCollector(System.err, MessageRenderer.PLAIN_RELATIVE_PATHS, true) + put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector) - configuration.addKotlinSourceRoot(sourceFile.canonicalPath) - - val messageCollector = PrintingMessageCollector(System.err, MessageRenderer.PLAIN_RELATIVE_PATHS, true) - configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector) - - configuration.put(CommonConfigurationKeys.MODULE_NAME, "test-module") - - return configuration + put(CommonConfigurationKeys.MODULE_NAME, "test-module") + } } private class KotlinCoreEnvironmentWrapper(val environment: KotlinCoreEnvironment,