2 files changed, 20 insertions, 1 deletions
diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilLightTest.java b/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilLightTest.java
index bf0e0d5b9036..dd1f46dace4c 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilLightTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilLightTest.java
@@ -18,11 +18,13 @@ package com.intellij.openapi.util.io;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.PairProcessor;
+import com.intellij.util.SystemProperties;
 import com.intellij.util.ThreeState;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Convertor;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Arrays;
@@ -189,4 +191,11 @@ public class FileUtilLightTest {
       assertEquals("/a/b/.././c/", FileUtil.normalize("\\\\\\a\\\\//b//..///./c//"));
     }
   }
+
+  @Test
+  public void testRelativeToUserHome() {
+    assertEquals(SystemProperties.getUserHome(), FileUtil.getLocationRelativeToUserHome(SystemProperties.getUserHome(), false));
+    String expected = SystemInfo.isWindows ? "~\\relative" : "~/relative";
+    assertEquals(expected, FileUtil.getLocationRelativeToUserHome(SystemProperties.getUserHome() + "/relative", false));
+  }
 }
diff --git a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
index 383c07f2a87e..d2f593d13ff1 100644
--- a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -178,6 +178,16 @@ public class StringUtilTest extends TestCase {
     assertEquals("foo|", StringUtil.unquoteString("foo|", '|'));
   }
 
+  public void testIsQuotedString() {
+    assertFalse(StringUtil.isQuotedString(""));
+    assertFalse(StringUtil.isQuotedString("'"));
+    assertFalse(StringUtil.isQuotedString("\""));
+    assertTrue(StringUtil.isQuotedString("\"\""));
+    assertTrue(StringUtil.isQuotedString("''"));
+    assertTrue(StringUtil.isQuotedString("'ab'"));
+    assertTrue(StringUtil.isQuotedString("\"foo\""));
+  }
+
   public void testJoin() {
     assertEquals("foo,,bar", StringUtil.join(Arrays.asList("foo", "", "bar"), ","));
     assertEquals("foo,,bar", StringUtil.join(new String[]{"foo", "", "bar"}, ","));