azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use different names for mockJDK and fullJDK

Browse Source 
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
This commit is contained in:
Denis Zharkov
2016-04-13 14:47:12 +03:00
parent adff42add3
commit 193dd06f50
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
+4 -4
View File
@@ -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) {