From 193dd06f504fe75132af16d9544203235cd12c3b Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 13 Apr 2016 14:47:12 +0300 Subject: [PATCH] Use different names for mockJDK and fullJDK It's needed because they both used in one project in some tests, while IDEA model relies on assumption that JDK's names are unique --- .../jetbrains/kotlin/idea/test/PluginTestCaseBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java index 03032abcc49..0e561b44d2b 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java @@ -37,20 +37,20 @@ public class PluginTestCaseBase { } @NotNull - private static Sdk getSdk(String sdkHome) { - return JavaSdk.getInstance().createJdk("JDK", sdkHome, true); + private static Sdk getSdk(String sdkHome, String name) { + return JavaSdk.getInstance().createJdk(name + " JDK", sdkHome, true); } @NotNull public static Sdk mockJdk() { - return getSdk("compiler/testData/mockJDK/jre"); + return getSdk("compiler/testData/mockJDK/jre", "Mock"); } @NotNull public static Sdk fullJdk() { String javaHome = System.getProperty("java.home"); assert new File(javaHome).isDirectory(); - return getSdk(javaHome); + return getSdk(javaHome, "Full"); } public static boolean isAllFilesPresentTest(@NotNull String testName) {