From 19f08c82f925aa615f0545e2a30493567d45bd06 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 8 May 2015 19:59:48 +0200
Subject: [PATCH] Cleanup (tests merged)

---
 .../vfs/local/SymlinkHandlingTest.java        | 44 +++++++++++-
 .../openapi/vfs/local/SymlinkTestCase.java    | 71 -------------------
 2 files changed, 43 insertions(+), 72 deletions(-)
 delete mode 100644 platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkTestCase.java

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 218cc4c865d6..12aa12edd134 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
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
+import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
@@ -33,7 +34,37 @@ import java.util.Set;
 import static com.intellij.openapi.util.io.IoTestUtil.*;
 import static com.intellij.testFramework.PlatformTestUtil.assertPathsEqual;
 
-public class SymlinkHandlingTest extends SymlinkTestCase {
+public class SymlinkHandlingTest extends LightPlatformTestCase {
+  protected LocalFileSystem myFileSystem;
+  protected File myTempDir;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    myFileSystem = LocalFileSystem.getInstance();
+    myTempDir = createTestDir("temp");
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    try {
+      super.tearDown();
+    }
+    finally {
+      delete(myTempDir);
+    }
+  }
+
+  @Override
+  protected void runTest() throws Throwable {
+    if (SystemInfo.areSymLinksSupported) {
+      super.runTest();
+    }
+    else {
+      System.err.println("Skipped: " + getName());
+    }
+  }
+
   public void testMissingLink() throws Exception {
     File missingFile = new File(myTempDir, "missing_file");
     assertTrue(missingFile.getPath(), !missingFile.exists() || missingFile.delete());
@@ -362,6 +393,17 @@ public class SymlinkHandlingTest extends SymlinkTestCase {
     return myFileSystem.findFileByPath(ioFile.getPath());
   }
 
+  protected void refresh() {
+    assertTrue(myTempDir.getPath(), myTempDir.isDirectory() || myTempDir.mkdirs());
+
+    VirtualFile tempDir = myFileSystem.refreshAndFindFileByIoFile(myTempDir);
+    assertNotNull(myTempDir.getPath(), tempDir);
+
+    tempDir.getChildren();
+    tempDir.refresh(false, true);
+    VfsUtilCore.visitChildrenRecursively(tempDir, new VirtualFileVisitor() { });
+  }
+
   private static void assertBrokenLink(@NotNull VirtualFile link) {
     assertTrue(link.is(VFileProperty.SYMLINK));
     assertEquals(0, link.getLength());
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkTestCase.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkTestCase.java
deleted file mode 100644
index 999fa434481c..000000000000
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2000-2013 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.
- */
-package com.intellij.openapi.vfs.local;
-
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.io.IoTestUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileVisitor;
-import com.intellij.testFramework.LightPlatformLangTestCase;
-
-import java.io.File;
-
-import static com.intellij.openapi.util.io.IoTestUtil.createTestDir;
-
-public abstract class SymlinkTestCase extends LightPlatformLangTestCase {
-  protected LocalFileSystem myFileSystem;
-  protected File myTempDir;
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    myFileSystem = LocalFileSystem.getInstance();
-    myTempDir = createTestDir("temp");
-  }
-
-  @Override
-  protected void tearDown() throws Exception {
-    try {
-      super.tearDown();
-    }
-    finally {
-      IoTestUtil.delete(myTempDir);
-    }
-  }
-
-  @Override
-  protected void runTest() throws Throwable {
-    if (SystemInfo.areSymLinksSupported) {
-      super.runTest();
-    }
-    else {
-      System.err.println("Skipped: " + getName());
-    }
-  }
-
-  protected void refresh() {
-    assertTrue(myTempDir.getPath(), myTempDir.isDirectory() || myTempDir.mkdirs());
-
-    VirtualFile tempDir = myFileSystem.refreshAndFindFileByIoFile(myTempDir);
-    assertNotNull(myTempDir.getPath(), tempDir);
-
-    tempDir.getChildren();
-    tempDir.refresh(false, true);
-    VfsUtilCore.visitChildrenRecursively(tempDir, new VirtualFileVisitor() { });
-  }
-}