MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Test made FS-independent

Browse Source
This commit is contained in:
Roman Shevchenko
2010-10-22 17:53:19 +04:00
parent 96a1713e21
commit 3543fa1aad
4 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java
+2 -3
View File
@@ -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) {
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
+60 -68
View File
@@ -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);
}
}
java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java
+18 -2
View File
@@ -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<AbstractTreeNode> createComparator(final Queryable.PrintInfo printInfo) {
return new Comparator<AbstractTreeNode>() {
@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<AbstractTreeNode> DEFAULT_COMPARATOR = new Comparator<AbstractTreeNode>() {
@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<String, VirtualFile> buildNameToFileMap(VirtualFile[] files, VirtualFileFilter filter) {
private static HashMap<String, VirtualFile> buildNameToFileMap
(VirtualFile[] files, VirtualFileFilter
filter) {
HashMap<String, VirtualFile> map = new HashMap<String, VirtualFile>();
for (VirtualFile file : files) {
if (filter != null && !filter.accept(file)) continue;
platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
+2 -7
View File
@@ -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,