diff --git a/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java b/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java index 81b56545d06e..9d74773385d4 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java +++ b/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java @@ -109,15 +109,14 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase { assertStructureEqual(myStructure.getRootElement(), expected, 27, comparator); } - private void assertStructureEqual(PsiDirectory root, String expected, int maxRowCount, AbstractTreeStructure structure) { assertNotNull(root); PsiDirectoryNode rootNode = new PsiDirectoryNode(myProject, root, (ViewSettings)structure); - assertStructureEqual(rootNode, expected, maxRowCount, IdeaTestUtil.DEFAULT_COMPARATOR); + assertStructureEqual(rootNode, expected, maxRowCount, IdeaTestUtil.createComparator(myPrintInfo)); } private void assertStructureEqual(Object rootNode, String expected) { - assertStructureEqual(rootNode, expected, 17, IdeaTestUtil.DEFAULT_COMPARATOR); + assertStructureEqual(rootNode, expected, 17, IdeaTestUtil.createComparator(myPrintInfo)); } private void assertStructureEqual(Object rootNode, String expected, int maxRowCount, Comparator comparator) { diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java index af734635fbcf..80882a8f1fa6 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java @@ -7,18 +7,17 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { @Override protected void setUp() throws Exception { super.setUp(); - myPrintInfo = new Queryable.PrintInfo(new String[] {"className", "fileName", "fieldName", "methodName", "packageName"}); + myPrintInfo = new Queryable.PrintInfo(new String[]{"className", "fileName", "fieldName", "methodName", "packageName"}); } public void test1() { getProjectTreeStructure().setProviders(new SameNamesJoiner(), new ClassNameConvertor(myProject)); - assertStructureEqual(getPackageDirectory(), - "package1\n" + - " Class2.java converted\n" + - " Form1 joined\n" + - " Form1.java converted\n" + - " Form1.form\n" + - " Form2.form\n"); + assertStructureEqual(getPackageDirectory(), "package1\n" + + " Class2.java converted\n" + + " Form1 joined\n" + + " Form1.form\n" + + " Form1.java converted\n" + + " Form2.form\n"); } public void testStandardProviders() { @@ -26,61 +25,60 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { assertStructureEqual(getPackageDirectory(), "package1\n" + " Class1\n" + - " Form1\n" + - " Form1.form\n" + - " Form2.form\n" + " Class2.java\n" + " Class2\n" + " Class3\n" + - " Class4.java\n"); + " Class4.java\n" + + " Form1\n" + + " Form1.form\n" + + " Form2.form\n"); + assertStructureEqual("Project\n" + - " External Libraries\n" + - " Library: < java 1.7 >\n" + - " annotations.jar\n" + - " classpath.index\n" + - " META-INF\n" + - " MANIFEST.MF\n" + - " org\n" + - " intellij\n" + - " lang\n" + - " annotations\n" + - " Identifier\n" + - " Language\n" + - " Pattern\n" + - " PrintFormat\n" + - " PrintFormatPattern\n" + - " RegExp\n" - ); + " External Libraries\n" + + " Library: < java 1.7 >\n" + + " annotations.jar\n" + + " META-INF\n" + + " MANIFEST.MF\n" + + " classpath.index\n" + + " org\n" + + " intellij\n" + + " lang\n" + + " annotations\n" + + " Identifier\n" + + " Language\n" + + " Pattern\n" + + " PrintFormat\n" + + " PrintFormatPattern\n" + + " RegExp\n"); getProjectTreeStructure().setProviders(); assertStructureEqual(getPackageDirectory(), - "package1\n" + - " Form1.form\n" + - " Form2.form\n" + - " Class1.java\n" + - " Class2.java\n" + - " Class4.java\n" + - " Form1.java\n"); + "package1\n" + + " Class1.java\n" + + " Class2.java\n" + + " Class4.java\n" + + " Form1.form\n" + + " Form1.java\n" + + " Form2.form\n"); assertStructureEqual("Project\n" + - " External Libraries\n" + - " Library: < java 1.7 >\n" + - " annotations.jar\n" + - " classpath.index\n" + - " META-INF\n" + - " MANIFEST.MF\n" + - " org\n" + - " intellij\n" + - " lang\n" + - " annotations\n" + - " Identifier.class\n" + - " Language.class\n" + - " Pattern.class\n" + - " PrintFormat.class\n" + - " PrintFormatPattern.class\n" + - " RegExp.class\n" -); + " External Libraries\n" + + " Library: < java 1.7 >\n" + + " annotations.jar\n" + + " META-INF\n" + + " MANIFEST.MF\n" + + " classpath.index\n" + + " org\n" + + " intellij\n" + + " lang\n" + + " annotations\n" + + " Identifier.class\n" + + " Language.class\n" + + " Pattern.class\n" + + " PrintFormat.class\n" + + " PrintFormatPattern.class\n" + + " RegExp.class\n"); } public void testShowClassMembers() { @@ -96,9 +94,9 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { " Class1\n" + " InnerClass\n" + " myInnerClassField\n" + + " getValue\n" + " myField1\n" + " myField2\n" + - " getValue\n" + " Class2\n" + " InnerClass1\n" + " InnerClass12\n" + @@ -120,17 +118,14 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { " myInnerClassField\n" + " myInnerClassField\n" + " myInnerClassField\n" + + " getValue\n" + " myField1\n" + " myField2\n" + " myField3\n" + - " myField4\n" + - " getValue\n", 100); - - + " myField4\n", 100); } - - public void testGetParentObject(){ + public void testGetParentObject() { useStandardProviders(); myShowMembers = true; assertStructureEqual(getContentDirectory(), "getParentObject\n" + @@ -138,19 +133,16 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { " com\n" + " package1\n" + " Class1\n" + - " myField\n" + " method\n" + - " Form1\n" + - " Form1.form\n" + - " Form2.form\n" + + " myField\n" + " Class2.java\n" + " Class2\n" + " Class3\n" + - " Class4.java\n"); - + " Class4.java\n" + + " Form1\n" + + " Form1.form\n" + + " Form2.form\n"); checkContainsMethod(myStructure.getRootElement(), myStructure); - } - } diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java index fb2e4b476362..5a6357d9f184 100644 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java +++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java @@ -18,6 +18,7 @@ package com.intellij.testFramework; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.ui.Queryable; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -35,8 +36,21 @@ import java.util.*; import java.util.jar.JarFile; public class IdeaTestUtil extends PlatformTestUtil { + public static Comparator createComparator(final Queryable.PrintInfo printInfo) { + return new Comparator() { + @Override + public int compare(final AbstractTreeNode o1, final AbstractTreeNode o2) { + String displayText1 = o1.toTestString(printInfo); + String displayText2 = o2.toTestString(printInfo); + return displayText1.compareTo(displayText2); + } + }; + } - + /** + * Use {@link #createComparator(com.intellij.openapi.ui.Queryable.PrintInfo)} instead. + */ + @Deprecated public static final Comparator DEFAULT_COMPARATOR = new Comparator() { @Override public int compare(AbstractTreeNode o1, AbstractTreeNode o2) { @@ -48,7 +62,9 @@ public class IdeaTestUtil extends PlatformTestUtil { public static final CvsVirtualFileFilter CVS_FILE_FILTER = new CvsVirtualFileFilter(); - private static HashMap buildNameToFileMap(VirtualFile[] files, VirtualFileFilter filter) { + private static HashMap buildNameToFileMap + (VirtualFile[] files, VirtualFileFilter + filter) { HashMap map = new HashMap(); for (VirtualFile file : files) { if (filter != null && !filter.accept(file)) continue; diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index daf28f4f25ec..344160ddf02f 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -242,13 +242,8 @@ public class PlatformTestUtil { } /** - * @deprecated use {@link #print(AbstractTreeStructure structure, - Object node, - int currentLevel, - Comparator comparator, - int maxRowCount, - char paddingChar, - String[] dumpNames)} + * @deprecated use {@link #print(com.intellij.ide.util.treeView.AbstractTreeStructure, Object, int, java.util.Comparator, int, char, + * com.intellij.openapi.ui.Queryable.PrintInfo)} */ public static StringBuffer print(AbstractTreeStructure structure, Object node,