From abcda03df399fd5f900e50509c15851bfc97beb3 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 6 Aug 2013 13:55:45 +0400
Subject: [PATCH] test

---
 .../testFramework/vcs/DirectoryData.java      | 24 +++++++++++++------
 .../testFramework/vcs/DirectoryDataTest.java  |  5 ++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryData.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryData.java
index 51581d21050c..ddf8a91d443e 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryData.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryData.java
@@ -16,11 +16,10 @@
 package com.intellij.testFramework.vcs;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,10 +54,14 @@ public class DirectoryData {
   }
 
   public void clear() {
-    final File ioFile = new File(getBase().getPath());
-    final File[] files = ioFile.listFiles();
-    for (File file : files) {
-      FileUtil.delete(file);
+    final VirtualFile base = getBase();
+    if (base != null) {
+      new WriteCommandAction.Simple(null) {
+        @Override
+        protected void run() throws Throwable {
+          base.delete(this);
+        }
+      }.execute().throwException();
     }
   }
 
@@ -70,7 +73,14 @@ public class DirectoryData {
           final List<VirtualFile> currentLevel = new ArrayList<VirtualFile>();
           final List<VirtualFile> nextLevel = new ArrayList<VirtualFile>();
 
-          currentLevel.add(myBase.createChildDirectory(this, "dirData"));
+          try {
+            myBase.createChildDirectory(this, "dirData");
+          }
+          catch (IOException ignored) {
+          }
+          VirtualFile newBase = getBase();
+          assert newBase != null;
+          currentLevel.add(newBase);
           for (int i = 0; i < myLevels; i++) {
             for (VirtualFile file : currentLevel) {
               String numberInRow;
diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryDataTest.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryDataTest.java
index 188c14309501..eefb67dbe920 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryDataTest.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DirectoryDataTest.java
@@ -31,8 +31,8 @@ public class DirectoryDataTest extends FileBasedTest {
   @Test
   public void testQuadro() throws Exception {
     final DirectoryData data = new DirectoryData(myProject.getBaseDir(), 2, 2, ".txt");
+    data.clear();
     try {
-      data.clear();
       data.create();
 
       final String[] dirs = {"DL0N0", "DL0N1"};
@@ -51,7 +51,8 @@ public class DirectoryDataTest extends FileBasedTest {
         Assert.assertTrue(vFile.exists());
         Assert.assertTrue(! vFile.isDirectory());
       }
-    } finally {
+    }
+    finally {
       data.clear();
     }
   }