From 5b7323697acf4cac8203b6a7969a2d99004e710b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 6 Apr 2012 14:52:35 +0400
Subject: [PATCH] Added refreshing test data dir in AbstractLibrariesTest.

---
 .../libraries/AbstractLibrariesTest.java      | 22 +++++++++++++++----
 .../LibrariesWithoutSourcesTest.java          | 10 ++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java
index 0ca6fa27074..5cfbe35d52d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java
@@ -21,13 +21,17 @@ import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
-import com.intellij.openapi.util.io.FileUtil;
 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.PlatformTestCase;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.KotlinCompiler;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 
+import java.io.File;
+
 /**
  * @author Evgeny Gerashchenko
  * @since 3/23/12
@@ -43,12 +47,22 @@ public abstract class AbstractLibrariesTest extends PlatformTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        String libraryPath = FileUtil.getTempDirectory();
+        File libraryIoDir = createTempDir("libraries_");
+        VirtualFile testDataDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH);
+        assertNotNull(testDataDir);
+        VfsUtilCore.visitChildrenRecursively(testDataDir, new VirtualFileVisitor() {
+            @Override
+            public boolean visitFile(@NotNull VirtualFile file) {
+                file.getChildren();
+                file.refresh(false, true);
+                return true;
+            }
+        });
         librarySourceDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH + "/library");
         assertNotNull(librarySourceDir);
-        KotlinCompiler.ExitCode compilerExec = new KotlinCompiler().exec("-src", librarySourceDir.getPath(), "-output", libraryPath);
+        KotlinCompiler.ExitCode compilerExec = new KotlinCompiler().exec("-src", librarySourceDir.getPath(), "-output", libraryIoDir.getAbsolutePath());
         assertEquals(KotlinCompiler.ExitCode.OK, compilerExec);
-        libraryDir = LocalFileSystem.getInstance().findFileByPath(libraryPath);
+        libraryDir = LocalFileSystem.getInstance().findFileByIoFile(libraryIoDir);
         assertNotNull(libraryDir);
 
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java
index 0c768695979..756c5774225 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/LibrariesWithoutSourcesTest.java
@@ -33,7 +33,7 @@ import java.util.Map;
  * @since 3/11/12
  */
 public class LibrariesWithoutSourcesTest extends AbstractLibrariesTest {
-    private VirtualFile myClassFile;
+    private VirtualFile classFile;
 
     public void testAbstractClass() {
         doTest();
@@ -72,9 +72,9 @@ public class LibrariesWithoutSourcesTest extends AbstractLibrariesTest {
     }
 
     private void doTest() {
-        myClassFile = getClassFile();
+        classFile = getClassFile();
 
-        Map<ClsElementImpl, JetDeclaration> map = getDecompiledData(myClassFile).getClsElementsToJetElements();
+        Map<ClsElementImpl, JetDeclaration> map = getDecompiledData(classFile).getClsElementsToJetElements();
         checkNavigationElements(map);
         String decompiledTextWithMarks = getDecompiledTextWithMarks(map);
 
@@ -104,7 +104,7 @@ public class LibrariesWithoutSourcesTest extends AbstractLibrariesTest {
     }
 
     private String getDecompiledText() {
-        Document document = FileDocumentManager.getInstance().getDocument(myClassFile);
+        Document document = FileDocumentManager.getInstance().getDocument(classFile);
         assertNotNull(document);
         return document.getText();
     }
@@ -117,7 +117,7 @@ public class LibrariesWithoutSourcesTest extends AbstractLibrariesTest {
     }
 
     private void checkNavigationElements(Map<ClsElementImpl, JetDeclaration> map) {
-        PsiFile classPsiFile = getPsiManager().findFile(myClassFile);
+        PsiFile classPsiFile = getPsiManager().findFile(classFile);
         for (Map.Entry<ClsElementImpl, JetDeclaration> clsToJet : map.entrySet()) {
             assertSame(classPsiFile, clsToJet.getKey().getContainingFile());
             assertSame(clsToJet.getValue(), clsToJet.getKey().getNavigationElement());