user-independent PathMacroManagerTest, take 2

diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java
index 205841df887d49307f465f8d9253dce938cb3f43..cf3357ba0e1f6c1722bab83dd78577c665dc8692 100644 (file)
--- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java
@@ -208,14 +208,14 @@ public class PathMacroManagerTest {
                  "jar://tmp/foo -> jar:/$PROJECT_DIR$\n" +
                  "jar:///tmp/foo -> jar://$PROJECT_DIR$\n" +
                  "/tmp/foo -> $PROJECT_DIR$\n" +
-                 "" + USER_HOME + "/work/idea -> $APPLICATION_HOME_DIR$\n" +
-                 "file:" + USER_HOME + "/work/idea -> file:$APPLICATION_HOME_DIR$\n" +
-                 "file:/" + USER_HOME + "/work/idea -> file://$APPLICATION_HOME_DIR$\n" +
-                 "file://" + USER_HOME + "/work/idea -> file://$APPLICATION_HOME_DIR$\n" +
-                 "jar:" + USER_HOME + "/work/idea -> jar:$APPLICATION_HOME_DIR$\n" +
-                 "jar:/" + USER_HOME + "/work/idea -> jar://$APPLICATION_HOME_DIR$\n" +
-                 "jar://" + USER_HOME + "/work/idea -> jar://$APPLICATION_HOME_DIR$\n" +
-                 "" + USER_HOME + " -> $USER_HOME$\n" +
+                 APP_HOME + " -> $APPLICATION_HOME_DIR$\n" +
+                 "file:" + APP_HOME + " -> file:$APPLICATION_HOME_DIR$\n" +
+                 "file:/" + APP_HOME + " -> file://$APPLICATION_HOME_DIR$\n" +
+                 "file://" + APP_HOME + " -> file://$APPLICATION_HOME_DIR$\n" +
+                 "jar:" + APP_HOME + " -> jar:$APPLICATION_HOME_DIR$\n" +
+                 "jar:/" + APP_HOME + " -> jar://$APPLICATION_HOME_DIR$\n" +
+                 "jar://" + APP_HOME + " -> jar://$APPLICATION_HOME_DIR$\n" +
+                 USER_HOME + " -> $USER_HOME$\n" +
                  "file:" + USER_HOME + " -> file:$USER_HOME$\n" +
                  "file:/" + USER_HOME + " -> file://$USER_HOME$\n" +
                  "file://" + USER_HOME + " -> file://$USER_HOME$\n" +