From 3a5da55b6a0d1cd3b38dfe50d963276909edd7a5 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 9 Jun 2010 15:27:46 +0400
Subject: [PATCH] ProjectViewUpdateTest - FS (file order) dependency eliminated

---
 .../projectView/BaseProjectViewTestCase.java    | 17 +++++++++++++----
 .../projectView/NavigateFromSourceTest.java     |  6 +-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java b/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java
index f994d4fd51cf..eb79e4972970 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.projectView;
 
-import com.intellij.JavaTestUtil;
 import com.intellij.ide.SelectInTarget;
 import com.intellij.ide.projectView.BaseProjectTreeBuilder;
 import com.intellij.ide.projectView.ProjectView;
@@ -25,16 +24,17 @@ import com.intellij.ide.projectView.impl.nodes.PackageElementNode;
 import com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode;
 import com.intellij.ide.util.treeView.*;
 import com.intellij.openapi.application.ex.PathManagerEx;
+import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
-import com.intellij.openapi.ui.Queryable;
-import com.intellij.testFramework.IdeaTestUtil;
-import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.startup.StartupManager;
+import com.intellij.openapi.ui.Queryable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
+import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.testFramework.ProjectViewTestUtil;
 import com.intellij.testFramework.TestSourceBasedTestCase;
 import com.intellij.util.Function;
@@ -47,6 +47,7 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
@@ -290,4 +291,12 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
   protected Sdk getTestProjectJdk() {
     return JavaSdkImpl.getMockJdkCE();
   }
+
+  protected static void sortClasses(final PsiClass[] classes) {
+    Arrays.sort(classes, new Comparator<PsiClass>() {
+      public int compare(PsiClass o1, PsiClass o2) {
+        return o1.getName().compareTo(o2.getName());
+      }
+    });
+  }
 }
diff --git a/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java b/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
index 236d9fc925ef..c8c0899c4dbc 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
@@ -49,11 +49,7 @@ public class NavigateFromSourceTest extends BaseProjectViewTestCase {
   public void testShowClassMembers() throws Exception {
     useStandardProviders();
     final PsiClass[] classes = JavaDirectoryService.getInstance().getClasses(getPackageDirectory());
-    Arrays.sort(classes, new Comparator<PsiClass>() {
-      public int compare(PsiClass o1, PsiClass o2) {
-        return o1.getName().compareTo(o2.getName());
-      }
-    });
+    sortClasses(classes);
     PsiClass psiClass = classes[0];
 
     final AbstractProjectViewPSIPane pane = createPane();