From 2a7f32151b7e7f7810ec649767776e2f7c90e9f3 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 30 May 2016 14:44:45 +0200
Subject: [PATCH] LightPathMacroManagerTest

---
 .../components/impl/pathMacroManagerTest.kt   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/pathMacroManagerTest.kt b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/pathMacroManagerTest.kt
index efaddffb554e..19980260b7e1 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/pathMacroManagerTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/pathMacroManagerTest.kt
@@ -13,9 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import com.intellij.application.options.PathMacrosImpl
 import com.intellij.openapi.components.impl.BasePathMacroManager
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.util.SystemProperties
 import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.jps.model.serialization.PathMacroUtil
 import org.junit.Test
@@ -24,9 +41,10 @@ class LightPathMacroManagerTest {
   @Test
   fun systemOverridesUser() {
     val macros = PathMacrosImpl()
-    macros.setMacro("foo", "/home/user")
+    val userHome = FileUtil.toSystemIndependentName(SystemProperties.getUserHome())
+    macros.setMacro("foo", userHome)
 
     val manager = BasePathMacroManager(macros)
-    assertThat(manager.collapsePath(com.intellij.util.SystemProperties.getUserHome())).isEqualTo("$${PathMacroUtil.USER_HOME_NAME}$")
+    assertThat(manager.collapsePath(userHome)).isEqualTo("$${PathMacroUtil.USER_HOME_NAME}$")
   }
 }
\ No newline at end of file