mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Merge branch 'master' into changeSignature
This commit is contained in:
Maxim Medvedev
@@ -48,6 +48,7 @@ public class WordCompletionTest extends CompletionTestCase {
|
||||
return true;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return new Object[]{"MySoftVariant"};
|
||||
}
|
||||
@@ -66,6 +67,7 @@ public class WordCompletionTest extends CompletionTestCase {
|
||||
return false;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public Object[] getVariants() {
|
||||
return new Object[]{"MyHardVariant"};
|
||||
}
|
||||
|
||||
@@ -26,4 +26,6 @@ public class FieldCanBeLocalTest extends InspectionTestCase {
|
||||
public void testStaticAccess() throws Exception { doTest(); }
|
||||
public void testInnerClassConstructor() throws Exception { doTest(); }
|
||||
public void testLocalVar2InnerClass() throws Exception { doTest(); }
|
||||
public void testStateField() throws Exception { doTest(); }
|
||||
public void testLocalStateVar2InnerClass() throws Exception { doTest(); }
|
||||
}
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.intellij.ide.projectView.TreeStructureProvider;
|
||||
import com.intellij.ide.projectView.ViewSettings;
|
||||
import com.intellij.ide.util.treeView.AbstractTreeNode;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.Queryable;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiFile;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -37,6 +37,11 @@ class ClassNameConvertor implements TreeStructureProvider {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toTestString(Queryable.PrintInfo printInfo) {
|
||||
return super.toTestString(printInfo) + " converted";
|
||||
}
|
||||
|
||||
public String getTestPresentation() {
|
||||
return name + " converted";
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
|
||||
});
|
||||
}
|
||||
|
||||
public void _testVisibilitySorter() throws Exception {
|
||||
public void testVisibilitySorter() throws Exception {
|
||||
dotest(new CheckAction() {
|
||||
public void testClassStructure(StructureViewComponent structureViewComponent) {
|
||||
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
|
||||
|
||||
@@ -1,119 +1,129 @@
|
||||
package com.intellij.projectView;
|
||||
|
||||
import com.intellij.openapi.ui.Queryable;
|
||||
|
||||
public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
myPrintInfo = new Queryable.PrintInfo(new String[] {"className", "fileName", "fieldName", "methodName", "packageName"});
|
||||
}
|
||||
|
||||
public void test1() {
|
||||
getProjectTreeStructure().setProviders(new SameNamesJoiner(), new ClassNameConvertor(myProject));
|
||||
assertStructureEqual(getPackageDirectory(), "PsiDirectory: package1\n" +
|
||||
assertStructureEqual(getPackageDirectory(),
|
||||
"package1\n" +
|
||||
" Class2.java converted\n" +
|
||||
" Form1 joined\n" +
|
||||
" Form1.java converted\n" +
|
||||
" PsiFile(plain text):Form1.form\n" +
|
||||
" PsiFile(plain text):Form2.form\n");
|
||||
" Form1.form\n" +
|
||||
" Form2.form\n");
|
||||
}
|
||||
|
||||
public void _testStandardProviders() {
|
||||
public void testStandardProviders() {
|
||||
useStandardProviders();
|
||||
|
||||
assertStructureEqual(getPackageDirectory(), "PsiDirectory: package1\n" +
|
||||
" PsiClass:Class1\n" +
|
||||
" PsiClass:Form1\n" +
|
||||
" PsiFile(plain text):Form1.form\n" +
|
||||
" PsiFile(plain text):Form2.form\n" +
|
||||
" PsiJavaFile:Class2.java\n" +
|
||||
" PsiClass:Class2\n" +
|
||||
" PsiClass:Class3\n" +
|
||||
" PsiJavaFile:Class4.java\n");
|
||||
assertStructureEqual(getPackageDirectory(), "package1\n" +
|
||||
" Class1\n" +
|
||||
" Form1\n" +
|
||||
" Form1.form\n" +
|
||||
" Form2.form\n" +
|
||||
" Class2.java\n" +
|
||||
" Class2\n" +
|
||||
" Class3\n" +
|
||||
" Class4.java\n");
|
||||
assertStructureEqual("Project\n" +
|
||||
" External Libraries\n" +
|
||||
" Library: < java 1.4 >\n" +
|
||||
" PsiDirectory: jsp-api.jar\n" +
|
||||
" PsiDirectory: META-INF\n" +
|
||||
" PsiFile(plain text):MANIFEST.MF\n" +
|
||||
" PsiDirectory: javax\n" +
|
||||
" PsiDirectory: servlet\n" +
|
||||
" PsiDirectory: jsp\n" +
|
||||
" PsiClass:ErrorData\n" +
|
||||
" PsiClass:HttpJspPage\n" +
|
||||
" PsiClass:JspContext\n" +
|
||||
" PsiClass:JspEngineInfo\n" +
|
||||
" PsiClass:JspException\n" +
|
||||
" PsiClass:JspFactory\n" +
|
||||
" PsiClass:JspPage\n" +
|
||||
" PsiClass:JspTagException\n"
|
||||
" jsp-api.jar\n" +
|
||||
" META-INF\n" +
|
||||
" MANIFEST.MF\n" +
|
||||
" javax\n" +
|
||||
" servlet\n" +
|
||||
" jsp\n" +
|
||||
" ErrorData\n" +
|
||||
" HttpJspPage\n" +
|
||||
" JspContext\n" +
|
||||
" JspEngineInfo\n" +
|
||||
" JspException\n" +
|
||||
" JspFactory\n" +
|
||||
" JspPage\n" +
|
||||
" JspTagException\n"
|
||||
);
|
||||
|
||||
getProjectTreeStructure().setProviders();
|
||||
|
||||
assertStructureEqual(getPackageDirectory(), "PsiDirectory: package1\n" +
|
||||
" PsiFile(plain text):Form1.form\n" +
|
||||
" PsiFile(plain text):Form2.form\n" +
|
||||
" PsiJavaFile:Class1.java\n" +
|
||||
" PsiJavaFile:Class2.java\n" +
|
||||
" PsiJavaFile:Class4.java\n" +
|
||||
" PsiJavaFile:Form1.java\n");
|
||||
assertStructureEqual(getPackageDirectory(),
|
||||
"package1\n" +
|
||||
" Form1.form\n" +
|
||||
" Form2.form\n" +
|
||||
" Class1.java\n" +
|
||||
" Class2.java\n" +
|
||||
" Class4.java\n" +
|
||||
" Form1.java\n");
|
||||
|
||||
assertStructureEqual("Project\n" +
|
||||
" External Libraries\n" +
|
||||
" Library: < java 1.4 >\n" +
|
||||
" PsiDirectory: jsp-api.jar\n" +
|
||||
" PsiDirectory: META-INF\n" +
|
||||
" PsiFile(plain text):MANIFEST.MF\n" +
|
||||
" PsiDirectory: javax\n" +
|
||||
" PsiDirectory: servlet\n" +
|
||||
" PsiDirectory: jsp\n" +
|
||||
" PsiDirectory: el\n" +
|
||||
" PsiFile:ELException.class\n" +
|
||||
" PsiFile:ELParseException.class\n" +
|
||||
" PsiFile:Expression.class\n" +
|
||||
" PsiFile:ExpressionEvaluator.class\n" +
|
||||
" PsiFile:FunctionMapper.class\n" +
|
||||
" PsiFile:VariableResolver.class\n" +
|
||||
" PsiDirectory: resources\n");
|
||||
" jsp-api.jar\n" +
|
||||
" META-INF\n" +
|
||||
" MANIFEST.MF\n" +
|
||||
" javax\n" +
|
||||
" servlet\n" +
|
||||
" jsp\n" +
|
||||
" el\n" +
|
||||
" ELException.class\n" +
|
||||
" ELParseException.class\n" +
|
||||
" Expression.class\n" +
|
||||
" ExpressionEvaluator.class\n" +
|
||||
" FunctionMapper.class\n" +
|
||||
" VariableResolver.class\n" +
|
||||
" resources\n");
|
||||
}
|
||||
|
||||
public void testShowClassMembers() {
|
||||
useStandardProviders();
|
||||
|
||||
myShowMembers = false;
|
||||
assertStructureEqual(getPackageDirectory(), "PsiDirectory: package1\n" +
|
||||
" PsiClass:Class1\n" +
|
||||
" PsiClass:Class2\n");
|
||||
assertStructureEqual(getPackageDirectory(), "package1\n" +
|
||||
" Class1\n" +
|
||||
" Class2\n");
|
||||
|
||||
myShowMembers = true;
|
||||
assertStructureEqual(getPackageDirectory(), "PsiDirectory: package1\n" +
|
||||
" PsiClass:Class1\n" +
|
||||
" PsiClass:InnerClass\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myField1\n" +
|
||||
" PsiField:myField2\n" +
|
||||
" PsiMethod:getValue\n" +
|
||||
" PsiClass:Class2\n" +
|
||||
" PsiClass:InnerClass1\n" +
|
||||
" PsiClass:InnerClass12\n" +
|
||||
" PsiClass:InnerClass13\n" +
|
||||
" PsiClass:InnerClass14\n" +
|
||||
" PsiClass:InnerClass15\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiClass:InnerClass2\n" +
|
||||
" PsiClass:InnerClass22\n" +
|
||||
" PsiClass:InnerClass23\n" +
|
||||
" PsiClass:InnerClass24\n" +
|
||||
" PsiClass:InnerClass25\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myFieldToSelect\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myInnerClassField\n" +
|
||||
" PsiField:myField1\n" +
|
||||
" PsiField:myField2\n" +
|
||||
" PsiField:myField3\n" +
|
||||
" PsiField:myField4\n" +
|
||||
" PsiMethod:getValue\n", 100);
|
||||
assertStructureEqual(getPackageDirectory(), "package1\n" +
|
||||
" Class1\n" +
|
||||
" InnerClass\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myField1\n" +
|
||||
" myField2\n" +
|
||||
" getValue\n" +
|
||||
" Class2\n" +
|
||||
" InnerClass1\n" +
|
||||
" InnerClass12\n" +
|
||||
" InnerClass13\n" +
|
||||
" InnerClass14\n" +
|
||||
" InnerClass15\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myInnerClassField\n" +
|
||||
" InnerClass2\n" +
|
||||
" InnerClass22\n" +
|
||||
" InnerClass23\n" +
|
||||
" InnerClass24\n" +
|
||||
" InnerClass25\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myFieldToSelect\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myInnerClassField\n" +
|
||||
" myField1\n" +
|
||||
" myField2\n" +
|
||||
" myField3\n" +
|
||||
" myField4\n" +
|
||||
" getValue\n", 100);
|
||||
|
||||
|
||||
}
|
||||
@@ -122,20 +132,20 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
|
||||
public void testGetParentObject(){
|
||||
useStandardProviders();
|
||||
myShowMembers = true;
|
||||
assertStructureEqual(getContentDirectory(), "PsiDirectory: getParentObject\n" +
|
||||
" PsiDirectory: src\n" +
|
||||
" PsiDirectory: com\n" +
|
||||
" PsiDirectory: package1\n" +
|
||||
" PsiClass:Class1\n" +
|
||||
" PsiField:myField\n" +
|
||||
" PsiMethod:method\n" +
|
||||
" PsiClass:Form1\n" +
|
||||
" PsiFile(plain text):Form1.form\n" +
|
||||
" PsiFile(plain text):Form2.form\n" +
|
||||
" PsiJavaFile:Class2.java\n" +
|
||||
" PsiClass:Class2\n" +
|
||||
" PsiClass:Class3\n" +
|
||||
" PsiJavaFile:Class4.java\n");
|
||||
assertStructureEqual(getContentDirectory(), "getParentObject\n" +
|
||||
" src\n" +
|
||||
" com\n" +
|
||||
" package1\n" +
|
||||
" Class1\n" +
|
||||
" myField\n" +
|
||||
" method\n" +
|
||||
" Form1\n" +
|
||||
" Form1.form\n" +
|
||||
" Form2.form\n" +
|
||||
" Class2.java\n" +
|
||||
" Class2\n" +
|
||||
" Class3\n" +
|
||||
" Class4.java\n");
|
||||
|
||||
|
||||
checkContainsMethod(myStructure.getRootElement(), myStructure);
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.intellij.ide.todo.AllTodosTreeBuilder;
|
||||
import com.intellij.ide.todo.CurrentFileTodosTreeBuilder;
|
||||
import com.intellij.ide.todo.TodoTreeStructure;
|
||||
import com.intellij.ide.todo.nodes.TodoItemNode;
|
||||
import com.intellij.openapi.ui.Queryable;
|
||||
import com.intellij.testFramework.IdeaTestUtil;
|
||||
import com.intellij.openapi.util.Disposer;
|
||||
import com.intellij.util.ui.tree.TreeUtil;
|
||||
@@ -14,6 +15,12 @@ import javax.swing.tree.DefaultTreeModel;
|
||||
|
||||
public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
myPrintInfo = new Queryable.PrintInfo(new String[] {"className", "fileName", "fieldName", "methodName", "packageName"}, new String[] {"toDoFileCount", "toDoItemCount"});
|
||||
}
|
||||
|
||||
public void testToDo1() throws Exception {
|
||||
AllTodosTreeBuilder all = new AllTodosTreeBuilder(new JTree(), new DefaultTreeModel(new DefaultMutableTreeNode()), myProject);
|
||||
all.init();
|
||||
@@ -22,8 +29,8 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
|
||||
((TodoTreeStructure)myStructure).setFlattenPackages(true);
|
||||
assertStructureEqual("Root\n" +
|
||||
" Summary\n" +
|
||||
" PsiPackage: package1.package2 (2 items in 1 file)\n" +
|
||||
" PsiJavaFile:JavaClass.java\n" +
|
||||
" package2 toDoFileCount=1,toDoItemCount=2\n" +
|
||||
" JavaClass.java\n" +
|
||||
" Item: (62,78)\n" +
|
||||
" Item: (145,162)\n", null);
|
||||
|
||||
@@ -32,26 +39,26 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
|
||||
}
|
||||
|
||||
//todo kirillk
|
||||
public void _testToDo() throws Exception {
|
||||
public void testToDo() throws Exception {
|
||||
AllTodosTreeBuilder all = new AllTodosTreeBuilder(new JTree(), new DefaultTreeModel(new DefaultMutableTreeNode()), myProject);
|
||||
all.init();
|
||||
|
||||
myStructure = all.getTreeStructure();
|
||||
assertStructureEqual("Root\n" +
|
||||
" Summary\n" +
|
||||
" PsiDirectory: toDo\n" +
|
||||
" XmlFile:xmlFile.xml\n"+
|
||||
" toDo\n" +
|
||||
" xmlFile.xml\n"+
|
||||
" Item: (12,16)\n" +
|
||||
" PsiPackage: package1 (4 items in 2 files)\n" +
|
||||
" PsiPackage: package2 (2 items in 1 file)\n" +
|
||||
" PsiJavaFile:JavaClass.java\n" +
|
||||
" package1 toDoFileCount=2,toDoItemCount=4\n" +
|
||||
" package2 toDoFileCount=1,toDoItemCount=2\n" +
|
||||
" JavaClass.java\n" +
|
||||
" Item: (62,78)\n" +
|
||||
" Item: (145,162)\n" +
|
||||
" PsiJavaFile:JavaClass.java\n" +
|
||||
" JavaClass.java\n" +
|
||||
" Item: (52,68)\n" +
|
||||
" Item: (134,151)\n" +
|
||||
" PsiPackage: package3 (2 items in 1 file)\n" +
|
||||
" PsiJavaFile:JavaClass.java\n" +
|
||||
" package3 toDoFileCount=1,toDoItemCount=2\n" +
|
||||
" JavaClass.java\n" +
|
||||
" Item: (53,69)\n" +
|
||||
" Item: (136,153)\n", null);
|
||||
|
||||
@@ -69,28 +76,12 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
|
||||
builder.setFile(getSrcDirectory().findSubdirectory("package1").findFile("JavaClass.java"));
|
||||
builder.updateFromRoot();
|
||||
myStructure = builder.getTreeStructure();
|
||||
assertStructureEqual("PsiJavaFile:JavaClass.java\n" +
|
||||
" PsiJavaFile:JavaClass.java\n" +
|
||||
assertStructureEqual("JavaClass.java\n" +
|
||||
" JavaClass.java\n" +
|
||||
" Item: (52,68)\n" +
|
||||
" Item: (134,151)\n", null);
|
||||
|
||||
TreeUtil.expandAll(currentFileTree);
|
||||
|
||||
currentFileTree.getSelectionModel().setSelectionPath(currentFileTree.getPathForRow(4));
|
||||
|
||||
IdeaTestUtil.assertTreeEqual(currentFileTree, "-Root\n" +
|
||||
" -Summary\n" +
|
||||
" -JavaClass.java\n" +
|
||||
" Item: (52,68)\n" +
|
||||
" [Item: (134,151)]\n", true);
|
||||
|
||||
IdeaTestUtil.waitForAlarm(600);
|
||||
|
||||
IdeaTestUtil.assertTreeEqual(currentFileTree, "-Root\n" +
|
||||
" -Summary\n" +
|
||||
" -JavaClass.java\n" +
|
||||
" Item: (52,68)\n" +
|
||||
" [Item: (134,151)]\n", true);
|
||||
Disposer.dispose(builder);
|
||||
Disposer.dispose(all);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user