IDEA-136072 (test fixed)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 10 Feb 2015 18:55:22 +0000 (19:55 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 10 Feb 2015 18:55:22 +0000 (19:55 +0100)
platform/util/testSrc/com/intellij/openapi/application/PathManagerTest.java

index cf8aee5fab5ba1b9e63c454d7096c43acef17082..c7deac22a25e5438d4a5679b3a8054ea021c8e70 100644 (file)
@@ -46,10 +46,17 @@ public class PathManagerTest {
 
     assertEquals("/" + TEST_VALUE + "/" + TEST_VALUE + "/", PathManager.substituteVars("/${" + TEST_RPOP + "}/${" + TEST_RPOP + "}/"));
 
-    assertEquals(PathManager.getHomePath() + "/build.txt", PathManager.substituteVars("${idea.home.path}/build.txt"));
-    assertEquals(PathManager.getHomePath() + "/build.txt", PathManager.substituteVars("${idea.home}/build.txt"));
-
-    assertEquals("/opt/idea/build.txt", PathManager.substituteVars("${idea.home.path}/build.txt", "/opt/idea"));
+    String home = System.clearProperty(PathManager.PROPERTY_HOME_PATH);
+    try {
+      assertEquals(PathManager.getHomePath() + "/build.txt", PathManager.substituteVars("${idea.home.path}/build.txt"));
+      assertEquals(PathManager.getHomePath() + "/build.txt", PathManager.substituteVars("${idea.home}/build.txt"));
+      assertEquals("/opt/idea/build.txt", PathManager.substituteVars("${idea.home.path}/build.txt", "/opt/idea"));
+    }
+    finally {
+      if (home != null) {
+        System.setProperty(PathManager.PROPERTY_HOME_PATH, home);
+      }
+    }
 
     String config = System.clearProperty(PathManager.PROPERTY_CONFIG_PATH);
     try {