From d5b30b04fda1ad68c1c0ee3ddc1444375a708cf7 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 12 Sep 2012 16:13:19 +0400
Subject: [PATCH] Cleanup

---
 .../vfs/local/SymlinkHandlingTest.java        | 16 +++------------
 .../intellij/openapi/util/io/IoTestUtil.java  | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
index 7d1ef4142ba9..2ccaf209d938 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
@@ -37,6 +37,7 @@ import java.util.Set;
 import static com.intellij.openapi.util.io.FileUtil.createTempDirectory;
 import static com.intellij.openapi.util.io.FileUtil.createTempFile;
 import static com.intellij.openapi.util.io.IoTestUtil.createTempLink;
+import static com.intellij.openapi.util.io.IoTestUtil.createTestDir;
 
 public class SymlinkHandlingTest extends LightPlatformLangTestCase {
   private LocalFileSystem myFileSystem;
@@ -46,18 +47,7 @@ public class SymlinkHandlingTest extends LightPlatformLangTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     myFileSystem = LocalFileSystem.getInstance();
-    myTempDir = createTempDirectory("test.", ".dir");
-  }
-
-  @Override
-  protected void tearDown() throws Exception {
-    try {
-      myFileSystem = null;
-      super.tearDown();
-    }
-    finally {
-      FileUtil.delete(myTempDir);
-    }
+    myTempDir = createTestDir("temp");
   }
 
   @Override
@@ -341,7 +331,7 @@ public class SymlinkHandlingTest extends LightPlatformLangTestCase {
   }
 */
 
-  public void testFindByLinkParentPath() throws Exception {
+  public void testTraversePathBehindLink() throws Exception {
     final File topDir = createTempDirectory(myTempDir, "top.", ".dir");
     final File subDir1 = createTempDirectory(topDir, "sub1.", ".dir");
     final File link = createTempLink(subDir1.getPath(), myTempDir + "/link");
diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java b/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
index f9f2dced5848..218cce18738c 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
@@ -211,4 +211,24 @@ public class IoTestUtil {
     }
     return jarFile;
   }
+
+  public static File createTestDir(final String name) {
+    return createTestDir(new File(FileUtil.getTempDirectory()), name);
+  }
+
+  public static File createTestDir(final File parent, final String name) {
+    final File dir = new File(parent, name);
+    assertTrue(dir.getPath(), dir.mkdirs());
+    return dir;
+  }
+
+  public static File createTestFile(final String name) throws IOException {
+    return createTestFile(new File(FileUtil.getTempDirectory()), name);
+  }
+
+  public static File createTestFile(final File parent, final String name) throws IOException {
+    final File file = new File(parent, name);
+    assertTrue(file.getPath(), file.createNewFile());
+    return file;
+  }
 }