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

Test fix (rt.jar path on Apple JRE)

Browse Source
This commit is contained in:
Roman Shevchenko
2014-04-15 11:53:23 +02:00
parent fb0efdddb4
commit 116a0fcbdd
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarFileSystemTest.java
+10 -7
View File
@@ -18,6 +18,7 @@ package com.intellij.openapi.vfs.local;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.IoTestUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -38,7 +39,7 @@ import static com.intellij.testFramework.PlatformTestUtil.assertPathsEqual;
public class JarFileSystemTest extends PlatformLangTestCase {
public void testFindFile() throws IOException {
String rtJarPath = System.getProperty("java.home") + "/lib/rt.jar";
String rtJarPath = getRtJarPath();
VirtualFile jarRoot = findByPath(rtJarPath + JarFileSystem.JAR_SEPARATOR);
assertTrue(jarRoot.isDirectory());
@@ -58,9 +59,7 @@ public class JarFileSystemTest extends PlatformLangTestCase {
}
public void testMetaInf() {
String rtJarPath = System.getProperty("java.home") + "/lib/rt.jar";
VirtualFile jarRoot = findByPath(rtJarPath + JarFileSystem.JAR_SEPARATOR);
VirtualFile jarRoot = findByPath(getRtJarPath() + JarFileSystem.JAR_SEPARATOR);
assertTrue(jarRoot.isDirectory());
VirtualFile metaInf = jarRoot.findChild("META-INF");
@@ -115,8 +114,7 @@ public class JarFileSystemTest extends PlatformLangTestCase {
}
public void testJarRootForLocalFile() throws Exception {
String javaHome = System.getProperty("java.home");
String rtJarPath = javaHome + "/lib/rt.jar";
String rtJarPath = getRtJarPath();
VirtualFile rtJarFile = LocalFileSystem.getInstance().findFileByPath(rtJarPath);
assertNotNull(rtJarFile);
@@ -127,12 +125,17 @@ public class JarFileSystemTest extends PlatformLangTestCase {
VirtualFile entryRoot = JarFileSystem.getInstance().getJarRootForLocalFile(entryFile);
assertNull(entryRoot);
VirtualFile nonJarFile = LocalFileSystem.getInstance().findFileByPath(javaHome + "/lib/calendars.properties");
VirtualFile nonJarFile = LocalFileSystem.getInstance().findFileByPath(System.getProperty("java.home") + "/lib/calendars.properties");
assertNotNull(nonJarFile);
VirtualFile nonJarRoot = JarFileSystem.getInstance().getJarRootForLocalFile(nonJarFile);
assertNull(nonJarRoot);
}
private static String getRtJarPath() {
String home = System.getProperty("java.home");
return home + (SystemInfo.isAppleJvm ? "../Classes/classes.jar" : "/lib/rt.jar");
}
private static VirtualFile findByPath(String path) {
VirtualFile file = JarFileSystem.getInstance().findFileByPath(path);
assertNotNull(file);