ProjectViewUpdateTest - FS (file order) dependency eliminated

This commit is contained in:
Roman Shevchenko
2010-06-09 15:27:46 +04:00
parent fdcfc0fde5
commit 3a5da55b6a
2 changed files with 14 additions and 9 deletions
@@ -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());
}
});
}
}
@@ -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();