MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-57233 Editor font antialising/appearance problems on Linux

Browse Source 
Corrected jdk bundle check for non-standard jdk bundles on mac
This commit is contained in:
Alexey Ushakov
2015-11-30 01:43:43 +03:00
parent 24f33773d3
commit 40e7343ce3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java
+6 -5
View File
@@ -38,7 +38,8 @@ public class JdkBundleTest {
File bootJDK = SystemInfo.isMac ? homeJDK.getParentFile().getParentFile() : homeJDK;
String verStr = System.getProperty("java.version");
JdkBundle bundle = (SystemInfo.isMac && !new File(bootJDK, "Contents/Home").exists())
boolean macNonStandardJDK = SystemInfo.isMac && !new File(bootJDK, "Contents/Home").exists();
JdkBundle bundle = macNonStandardJDK
? JdkBundle.createBundle(homeJDK, "", true, true) : // the test is run under jdk with non-standard layout
JdkBundle.createBundle(bootJDK, true, true);
@@ -47,7 +48,7 @@ public class JdkBundleTest {
assertTrue(bundle.isBoot());
assertTrue(bundle.isBundled());
assertTrue(FileUtil.filesEqual(bundle.getBundleAsFile(), bootJDK));
assertTrue(FileUtil.filesEqual(bundle.getBundleAsFile(), macNonStandardJDK ? homeJDK : bootJDK));
Pair<Version, Integer> verUpdate = bundle.getVersionUpdate();
assertNotNull(verUpdate);
@@ -65,15 +66,15 @@ public class JdkBundleTest {
File bootJDK = SystemInfo.isMac ? homeJDK.getParentFile().getParentFile() : homeJDK;
String verStr = System.getProperty("java.version");
JdkBundle bundle = (SystemInfo.isMac && !new File(bootJDK, "Contents/Home").exists())
? JdkBundle.createBoot(false) : // the test is run under jdk with non-standard layout
boolean macNonStandardJDK = SystemInfo.isMac && !new File(bootJDK, "Contents/Home").exists();
JdkBundle bundle = macNonStandardJDK ? JdkBundle.createBoot(false) : // the test is run under jdk with non-standard layout
JdkBundle.createBoot();
assertNotNull(bundle);
assertTrue(bundle.isBoot());
assertFalse(bundle.isBundled());
assertTrue(FileUtil.filesEqual(bundle.getBundleAsFile(), bootJDK));
assertTrue(FileUtil.filesEqual(bundle.getBundleAsFile(), macNonStandardJDK ? homeJDK : bootJDK));
Pair<Version, Integer> verUpdate = bundle.getVersionUpdate();
assertNotNull(verUpdate);