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

refactor project view test framework to allow testing project view without depending on testFramework-java and heavy tests

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-03-29 17:41:05 +01:00
parent ba6f4f8fa5
commit 59b6302908
28 changed files with 494 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
+3 -2
View File
@@ -46,6 +46,7 @@ import com.intellij.openapi.wm.ToolWindowId;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.psi.*;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.ProjectViewTestUtil;
import javax.swing.*;
import java.io.IOException;
@@ -58,11 +59,11 @@ public class NavigateFromSourceTest extends BaseProjectViewTestCase {
sortClassesByName(classes);
PsiClass psiClass = classes[0];
final AbstractProjectViewPSIPane pane = createPane();
final AbstractProjectViewPSIPane pane = myStructure.createPane();
final PsiFile containingFile = psiClass.getContainingFile();
final VirtualFile virtualFile = containingFile.getVirtualFile();
checkNavigateFromSourceBehaviour(psiClass, virtualFile, pane);
ProjectViewTestUtil.checkNavigateFromSourceBehaviour(psiClass, virtualFile, pane);
PlatformTestUtil.assertTreeEqual(pane.getTree(), "-Project\n" +
" -PsiDirectory: showClassMembers\n" +
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeBuilderTest.java
+8 -7
View File
@@ -12,6 +12,7 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiFile;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.ProjectViewTestUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ui.tree.TreeUtil;
@@ -25,11 +26,11 @@ public class ProjectTreeBuilderTest extends BaseProjectViewTestCase {
PsiFile element = aClass.getContainingFile();
checkNavigateFromSourceBehaviour(element, element.getVirtualFile(), createPane());
ProjectViewTestUtil.checkNavigateFromSourceBehaviour(element, element.getVirtualFile(), myStructure.createPane());
}
public void testShowClassMembers() throws IncorrectOperationException, IOException {
myShowMembers = true;
myStructure.setShowMembers(true);
useStandardProviders();
final PsiClass[] classes = JavaDirectoryService.getInstance().getClasses(getPackageDirectory());
sortClassesByName(classes);
@@ -48,9 +49,9 @@ public class ProjectTreeBuilderTest extends BaseProjectViewTestCase {
PsiField innerClass1Field = innerClass14.getFields()[0];
PsiField innerClass2Field = innerClass24.getFields()[0];
final AbstractProjectViewPSIPane pane = createPane();
final AbstractProjectViewPSIPane pane = myStructure.createPane();
checkNavigateFromSourceBehaviour(innerClass2Field, innerClass2Field.getContainingFile().getVirtualFile(), pane);
ProjectViewTestUtil.checkNavigateFromSourceBehaviour(innerClass2Field, innerClass2Field.getContainingFile().getVirtualFile(), pane);
IdeaTestUtil.assertTreeEqual(pane.getTree(), "-Project\n" +
" -PsiDirectory: showClassMembers\n" +
@@ -78,9 +79,9 @@ public class ProjectTreeBuilderTest extends BaseProjectViewTestCase {
" +External Libraries\n"
);
assertFalse(isExpanded(innerClass15.getFields()[0], pane));
assertFalse(isExpanded(innerClass1Field, pane));
assertTrue(isExpanded(innerClass2Field, pane));
assertFalse(ProjectViewTestUtil.isExpanded(innerClass15.getFields()[0], pane));
assertFalse(ProjectViewTestUtil.isExpanded(innerClass1Field, pane));
assertTrue(ProjectViewTestUtil.isExpanded(innerClass2Field, pane));
VirtualFile virtualFile = aClass.getContainingFile().getVirtualFile();
FileEditorManager fileEditorManager = FileEditorManager.getInstance(myProject);
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
+3 -3
View File
@@ -49,12 +49,12 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
public void testShowClassMembers() {
useStandardProviders();
myShowMembers = false;
myStructure.setShowMembers(false);
assertStructureEqual(getPackageDirectory(), "package1\n" +
" Class1\n" +
" Class2\n");
myShowMembers = true;
myStructure.setShowMembers(true);
assertStructureEqual(getPackageDirectory(), "package1\n" +
" Class1\n" +
" InnerClass\n" +
@@ -92,7 +92,7 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
public void testGetParentObject() {
useStandardProviders();
myShowMembers = true;
myStructure.setShowMembers(true);
assertStructureEqual(getContentDirectory(), "getParentObject\n" +
" src\n" +
" com\n" +
java/java-tests/testSrc/com/intellij/projectView/ToDoTreeStructureTest.java
+45 -42
View File
@@ -4,11 +4,11 @@ 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.ide.util.treeView.AbstractTreeStructure;
import com.intellij.openapi.ui.Queryable;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.openapi.util.Disposer;
import com.intellij.testFramework.ProjectViewTestUtil;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.util.ui.tree.TreeUtil;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -26,16 +26,18 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
AllTodosTreeBuilder all = new AllTodosTreeBuilder(new Tree(), new DefaultTreeModel(new DefaultMutableTreeNode()), myProject);
all.init();
myStructure = all.getTreeStructure();
((TodoTreeStructure)myStructure).setFlattenPackages(true);
assertStructureEqual("Root\n" +
" Summary\n" +
" package2 toDoFileCount=1,toDoItemCount=2\n" +
" JavaClass.java\n" +
" Item: (62,78)\n" +
" Item: (145,162)\n", null);
AbstractTreeStructure structure = all.getTreeStructure();
((TodoTreeStructure)structure).setFlattenPackages(true);
ProjectViewTestUtil.assertStructureEqual(structure,
"Root\n" +
" Summary\n" +
" package2 toDoFileCount=1,toDoItemCount=2\n" +
" JavaClass.java\n" +
" Item: (62,78)\n" +
" Item: (145,162)\n",
myPrintInfo);
checkOccurances(all, new String[]{"Item: (62,78)", "Item: (145,162)"});
checkOccurrences(all, new String[]{"Item: (62,78)", "Item: (145,162)"});
Disposer.dispose(all);
}
@@ -44,27 +46,28 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
AllTodosTreeBuilder all = new AllTodosTreeBuilder(new Tree(), new DefaultTreeModel(new DefaultMutableTreeNode()), myProject);
all.init();
myStructure = all.getTreeStructure();
assertStructureEqual("Root\n" +
" Summary\n" +
" toDo\n" +
" xmlFile.xml\n"+
" Item: (12,16)\n" +
" package1 toDoFileCount=2,toDoItemCount=4\n" +
" package2 toDoFileCount=1,toDoItemCount=2\n" +
" JavaClass.java\n" +
" Item: (62,78)\n" +
" Item: (145,162)\n" +
" JavaClass.java\n" +
" Item: (52,68)\n" +
" Item: (134,151)\n" +
" package3 toDoFileCount=1,toDoItemCount=2\n" +
" JavaClass.java\n" +
" Item: (53,69)\n" +
" Item: (136,153)\n", null);
AbstractTreeStructure structure = all.getTreeStructure();
ProjectViewTestUtil.assertStructureEqual(structure,
"Root\n" +
" Summary\n" +
" toDo\n" +
" xmlFile.xml\n" +
" Item: (12,16)\n" +
" package1 toDoFileCount=2,toDoItemCount=4\n" +
" package2 toDoFileCount=1,toDoItemCount=2\n" +
" JavaClass.java\n" +
" Item: (62,78)\n" +
" Item: (145,162)\n" +
" JavaClass.java\n" +
" Item: (52,68)\n" +
" Item: (134,151)\n" +
" package3 toDoFileCount=1,toDoItemCount=2\n" +
" JavaClass.java\n" +
" Item: (53,69)\n" +
" Item: (136,153)\n", myPrintInfo);
checkOccurances(all, new String[]{"Item: (12,16)","Item: (62,78)", "Item: (145,162)", "Item: (52,68)", "Item: (134,151)",
"Item: (53,69)", "Item: (136,153)"});
checkOccurrences(all, new String[]{"Item: (12,16)", "Item: (62,78)", "Item: (145,162)", "Item: (52,68)", "Item: (134,151)",
"Item: (53,69)", "Item: (136,153)"});
final DefaultTreeModel treeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
@@ -76,29 +79,29 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
builder.init();
builder.setFile(getSrcDirectory().findSubdirectory("package1").findFile("JavaClass.java"));
builder.updateFromRoot();
myStructure = builder.getTreeStructure();
assertStructureEqual("JavaClass.java\n" +
" JavaClass.java\n" +
" Item: (52,68)\n" +
" Item: (134,151)\n", null);
ProjectViewTestUtil.assertStructureEqual(builder.getTreeStructure(),
"JavaClass.java\n" +
" JavaClass.java\n" +
" Item: (52,68)\n" +
" Item: (134,151)\n", myPrintInfo);
Disposer.dispose(builder);
Disposer.dispose(all);
}
private void checkOccurances(final AllTodosTreeBuilder all, final String[] strings) {
TodoItemNode current = all.getFirstPointerForElement(myStructure.getRootElement());
for (int i = 0; i < strings.length; i++) {
String string = strings[i];
private static void checkOccurrences(final AllTodosTreeBuilder all, final String[] strings) {
AbstractTreeStructure allTreeStructure = all.getTreeStructure();
TodoItemNode current = all.getFirstPointerForElement(allTreeStructure.getRootElement());
for (String string : strings) {
assertNotNull(current);
assertEquals(string, current.getTestPresentation());
assertEquals(string, current.getTestPresentation());
current = all.getNextPointer(current);
}
assertNull(current);
current = all.getLastPointerForElement(myStructure.getRootElement());
current = all.getLastPointerForElement(allTreeStructure.getRootElement());
for (int i = strings.length - 1; i >= 0; i--) {
String string = strings[i];
assertNotNull(current);
java/testFramework/src/com/intellij/projectView/BaseProjectViewTestCase.java
+8 -204
View File
@@ -15,45 +15,27 @@
*/
package com.intellij.projectView;
import com.intellij.ide.SelectInTarget;
import com.intellij.ide.projectView.BaseProjectTreeBuilder;
import com.intellij.ide.projectView.ProjectView;
import com.intellij.ide.projectView.ViewSettings;
import com.intellij.ide.projectView.impl.*;
import com.intellij.ide.projectView.impl.AbstractProjectTreeStructure;
import com.intellij.ide.projectView.impl.ClassesTreeStructureProvider;
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.ide.util.treeView.AbstractTreeNode;
import com.intellij.ide.util.treeView.AbstractTreeStructure;
import com.intellij.openapi.application.ex.PathManagerEx;
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.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.ProjectViewTestUtil;
import com.intellij.testFramework.TestSourceBasedTestCase;
import com.intellij.util.Function;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
protected AbstractTreeStructure myStructure;
protected boolean myShowMembers = false;
protected boolean myHideEmptyMiddlePackages;
protected boolean myFlattenPackages;
private List<AbstractProjectViewPSIPane> myPanes = new ArrayList<AbstractProjectViewPSIPane>();
protected TestProjectTreeStructure myStructure;
protected Queryable.PrintInfo myPrintInfo;
@@ -61,41 +43,15 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
protected void setUp() throws Exception {
super.setUp();
myStructure = new TestProjectTreeStructure(myProject) {
@Override
public boolean isShowMembers() {
return myShowMembers;
}
@Override
public boolean isHideEmptyMiddlePackages() {
return myHideEmptyMiddlePackages;
}
@Override
public boolean isFlattenPackages() {
return myFlattenPackages;
}
};
myStructure = new TestProjectTreeStructure(myProject, myTestRootDisposable);
}
@Override
protected void tearDown() throws Exception {
for (final AbstractProjectViewPSIPane myPane : myPanes) {
Disposer.dispose(myPane);
}
myPanes = null;
myStructure = null;
super.tearDown();
}
protected AbstractProjectViewPSIPane createPane() {
final AbstractProjectViewPSIPane pane = new MyAbstractProjectViewPSIPane();
pane.createComponent();
myPanes.add(pane);
return pane;
}
protected void assertStructureEqual(PsiDirectory packageDirectory, @NonNls String expected) {
assertStructureEqual(packageDirectory, expected, 17, myStructure);
}
@@ -109,71 +65,13 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
}
protected AbstractProjectTreeStructure getProjectTreeStructure() {
return (AbstractProjectTreeStructure)myStructure;
}
protected void assertStructureEqual(String expected, Comparator comparator) {
assertStructureEqual(myStructure.getRootElement(), expected, 27, comparator);
return myStructure;
}
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, PlatformTestUtil.createComparator(myPrintInfo));
}
private void assertStructureEqual(Object rootNode, String expected, int maxRowCount, Comparator comparator) {
checkGetParentConsistency(rootNode);
String actual = PlatformTestUtil.print(myStructure, rootNode, 0, comparator, maxRowCount, ' ', myPrintInfo).toString();
assertEquals(expected, actual);
}
private void checkGetParentConsistency(Object from) {
Object[] childElements = myStructure.getChildElements(from);
for (Object childElement : childElements) {
assertSame(from, myStructure.getParentElement(childElement));
checkGetParentConsistency(childElement);
}
}
protected static boolean isExpanded(DefaultMutableTreeNode nodeForElement, AbstractProjectViewPSIPane pane) {
TreePath path = new TreePath(nodeForElement.getPath());
return pane.getTree().isExpanded(path.getParentPath());
}
protected static DefaultMutableTreeNode getNodeForElement(PsiElement element, AbstractProjectViewPSIPane pane) {
JTree tree = pane.getTree();
TreeModel model = tree.getModel();
Object root = model.getRoot();
return getNodeForElement(root, model, element);
}
private static DefaultMutableTreeNode getNodeForElement(Object root, TreeModel model, PsiElement element) {
if (root instanceof DefaultMutableTreeNode) {
Object userObject = ((DefaultMutableTreeNode)root).getUserObject();
if (userObject instanceof AbstractTreeNode) {
AbstractTreeNode treeNode = (AbstractTreeNode)userObject;
if (element.equals(treeNode.getValue())) return (DefaultMutableTreeNode)root;
for (int i = 0; i < model.getChildCount(root); i++) {
DefaultMutableTreeNode nodeForChild = getNodeForElement(model.getChild(root, i), model, element);
if (nodeForChild != null) return nodeForChild;
}
}
}
return null;
}
public static void checkNavigateFromSourceBehaviour(PsiElement element, VirtualFile virtualFile, AbstractProjectViewPSIPane pane) {
Disposer.dispose(pane);
pane.createComponent();
assertNull(getNodeForElement(element, pane));
pane.select(element, virtualFile, true);
assertTrue(isExpanded(element, pane));
}
public static boolean isExpanded(PsiElement element, AbstractProjectViewPSIPane pane) {
DefaultMutableTreeNode nodeForElement = getNodeForElement(element, pane);
return nodeForElement != null && isExpanded((DefaultMutableTreeNode)nodeForElement.getParent(), pane);
ProjectViewTestUtil.assertStructureEqual(myStructure, expected, maxRowCount, PlatformTestUtil.createComparator(myPrintInfo), rootNode, myPrintInfo);
}
protected static void assertListsEqual(ListModel model, String expected) {
@@ -205,100 +103,6 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
return getPackageDirectory(getPackageRelativePath());
}
private class MyAbstractProjectViewPSIPane extends AbstractProjectViewPSIPane {
public MyAbstractProjectViewPSIPane() {
super(BaseProjectViewTestCase.this.myProject);
}
@Override
public SelectInTarget createSelectInTarget() {
return null;
}
@NonNls
public String getComponentName() {
return "comp name";
}
@Override
protected AbstractTreeUpdater createTreeUpdater(AbstractTreeBuilder treeBuilder) {
return new AbstractTreeUpdater(treeBuilder);
}
@Override
@NotNull
protected BaseProjectTreeBuilder createBuilder(DefaultTreeModel treeModel) {
return new ProjectTreeBuilder(myProject, myTree, treeModel, AlphaComparator.INSTANCE,
(ProjectAbstractTreeStructureBase)myTreeStructure) {
@Override
protected AbstractTreeUpdater createUpdater() {
return createTreeUpdater(this);
}
protected void addTaskToWorker(final Runnable runnable, boolean first, final Runnable postRunnable) {
runnable.run();
postRunnable.run();
}
};
}
@Override
protected ProjectAbstractTreeStructureBase createStructure() {
return (ProjectAbstractTreeStructureBase)myStructure;
}
@Override
protected ProjectViewTree createTree(DefaultTreeModel treeModel) {
return new ProjectViewTree(myProject, treeModel) {
@Override
public DefaultMutableTreeNode getSelectedNode() {
return null;
}
};
}
@Override
public Icon getIcon() {
return null;
}
@Override
@NotNull
public String getId() {
return "";
}
@Override
public String getTitle() {
return null;
}
@Override
public int getWeight() {
return 0;
}
public void projectOpened() {
final Runnable runnable = new DumbAwareRunnable() {
@Override
public void run() {
final ProjectView projectView = ProjectView.getInstance(myProject);
projectView.addProjectPane(MyAbstractProjectViewPSIPane.this);
}
};
StartupManager.getInstance(myProject).registerPostStartupActivity(runnable);
}
public void projectClosed() {
}
public void initComponent() { }
public void disposeComponent() {
}
}
@Override
protected String getTestDataPath() {
return PathManagerEx.getTestDataPath(getClass());
java/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
-55
View File
@@ -1,55 +0,0 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.projectView;
import com.intellij.ide.projectView.impl.AbstractProjectTreeStructure;
import com.intellij.openapi.project.Project;
class TestProjectTreeStructure extends AbstractProjectTreeStructure {
public TestProjectTreeStructure(Project project) {
super(project);
}
@Override
public boolean isShowMembers() {
return false;
}
@Override
public boolean isFlattenPackages() {
return false;
}
@Override
public boolean isAbbreviatePackageNames() {
return false;
}
@Override
public boolean isHideEmptyMiddlePackages() {
return false;
}
@Override
public boolean isShowLibraryContents() {
return true;
}
@Override
public boolean isShowModules() {
return true;
}
}
java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
+1 -2
View File
@@ -95,7 +95,6 @@ import java.io.File;
protected String getRootFiles() {
return " " + myModule.getModuleFile().getName() + "\n" +
" " + myProject.getName() + ProjectFileType.DOT_DEFAULT_EXTENSION +
"\n";
" " + myProject.getName() + ProjectFileType.DOT_DEFAULT_EXTENSION + "\n";
}
}
platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
+91
View File
@@ -0,0 +1,91 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.projectView;
import com.intellij.ide.highlighter.ProjectFileType;
import com.intellij.ide.projectView.impl.AbstractProjectTreeStructure;
import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
public class TestProjectTreeStructure extends AbstractProjectTreeStructure implements Disposable {
protected boolean myShowMembers = false;
protected boolean myHideEmptyMiddlePackages;
protected boolean myFlattenPackages;
public TestProjectTreeStructure(Project project, Disposable parentDisposable) {
super(project);
Disposer.register(parentDisposable, this);
}
public AbstractProjectViewPSIPane createPane() {
final AbstractProjectViewPSIPane pane = new TestProjectViewPSIPane(myProject, this);
pane.createComponent();
Disposer.register(this, pane);
return pane;
}
@Override
public boolean isShowMembers() {
return myShowMembers;
}
@Override
public boolean isFlattenPackages() {
return myFlattenPackages;
}
@Override
public boolean isAbbreviatePackageNames() {
return false;
}
@Override
public boolean isHideEmptyMiddlePackages() {
return myHideEmptyMiddlePackages;
}
@Override
public boolean isShowLibraryContents() {
return true;
}
@Override
public boolean isShowModules() {
return true;
}
public void setShowMembers(boolean showMembers) {
myShowMembers = showMembers;
}
public void setHideEmptyMiddlePackages(boolean hideEmptyMiddlePackages) {
myHideEmptyMiddlePackages = hideEmptyMiddlePackages;
}
public void setFlattenPackages(boolean flattenPackages) {
myFlattenPackages = flattenPackages;
}
@Override
public void dispose() {
}
public String getProjectFileRepresentation() {
return " " + myProject.getName() + ProjectFileType.DOT_DEFAULT_EXTENSION + "\n";
}
}
platform/testFramework/src/com/intellij/projectView/TestProjectViewPSIPane.java
+121
View File
@@ -0,0 +1,121 @@
package com.intellij.projectView;
import com.intellij.ide.SelectInTarget;
import com.intellij.ide.projectView.BaseProjectTreeBuilder;
import com.intellij.ide.projectView.ProjectView;
import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
import com.intellij.ide.projectView.impl.ProjectAbstractTreeStructureBase;
import com.intellij.ide.projectView.impl.ProjectTreeBuilder;
import com.intellij.ide.projectView.impl.ProjectViewTree;
import com.intellij.ide.util.treeView.AbstractTreeBuilder;
import com.intellij.ide.util.treeView.AbstractTreeUpdater;
import com.intellij.ide.util.treeView.AlphaComparator;
import com.intellij.openapi.project.DumbAwareRunnable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.startup.StartupManager;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
/**
* @author yole
*/
class TestProjectViewPSIPane extends AbstractProjectViewPSIPane {
private TestProjectTreeStructure myTestTreeStructure;
public TestProjectViewPSIPane(Project project, TestProjectTreeStructure treeStructure) {
super(project);
myTestTreeStructure = treeStructure;
}
@Override
public SelectInTarget createSelectInTarget() {
return null;
}
@NonNls
public String getComponentName() {
return "comp name";
}
@Override
protected AbstractTreeUpdater createTreeUpdater(AbstractTreeBuilder treeBuilder) {
return new AbstractTreeUpdater(treeBuilder);
}
@Override
@NotNull
protected BaseProjectTreeBuilder createBuilder(DefaultTreeModel treeModel) {
return new ProjectTreeBuilder(myProject, myTree, treeModel, AlphaComparator.INSTANCE,
(ProjectAbstractTreeStructureBase)myTreeStructure) {
@Override
protected AbstractTreeUpdater createUpdater() {
return createTreeUpdater(this);
}
protected void addTaskToWorker(final Runnable runnable, boolean first, final Runnable postRunnable) {
runnable.run();
postRunnable.run();
}
};
}
@Override
protected ProjectAbstractTreeStructureBase createStructure() {
return myTestTreeStructure;
}
@Override
protected ProjectViewTree createTree(DefaultTreeModel treeModel) {
return new ProjectViewTree(myProject, treeModel) {
@Override
public DefaultMutableTreeNode getSelectedNode() {
return null;
}
};
}
@Override
public Icon getIcon() {
return null;
}
@Override
@NotNull
public String getId() {
return "";
}
@Override
public String getTitle() {
return null;
}
@Override
public int getWeight() {
return 0;
}
public void projectOpened() {
final Runnable runnable = new DumbAwareRunnable() {
@Override
public void run() {
final ProjectView projectView = ProjectView.getInstance(myProject);
projectView.addProjectPane(TestProjectViewPSIPane.this);
}
};
StartupManager.getInstance(myProject).registerPostStartupActivity(runnable);
}
public void projectClosed() {
}
public void initComponent() { }
public void disposeComponent() {
}
}
platform/testFramework/src/com/intellij/testFramework/ProjectViewTestUtil.java
+74
View File
@@ -16,17 +16,26 @@
package com.intellij.testFramework;
import com.intellij.ide.projectView.ProjectViewNode;
import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
import com.intellij.ide.projectView.impl.nodes.BasePsiNode;
import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.ide.util.treeView.AbstractTreeStructure;
import com.intellij.openapi.ui.Queryable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.MultiValuesMap;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.util.Function;
import junit.framework.Assert;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import java.util.Collection;
import java.util.Comparator;
public class ProjectViewTestUtil {
public static VirtualFile[] getFiles(AbstractTreeNode kid, Function<AbstractTreeNode, VirtualFile[]> converterFunction) {
@@ -86,4 +95,69 @@ public class ProjectViewTestUtil {
}
}
}
public static void checkGetParentConsistency(AbstractTreeStructure structure, Object from) {
Object[] childElements = structure.getChildElements(from);
for (Object childElement : childElements) {
Assert.assertSame(from, structure.getParentElement(childElement));
checkGetParentConsistency(structure, childElement);
}
}
public static void assertStructureEqual(AbstractTreeStructure structure,
String expected,
@Nullable Queryable.PrintInfo printInfo) {
assertStructureEqual(structure, expected, 27, null, structure.getRootElement(), printInfo);
}
public static void assertStructureEqual(AbstractTreeStructure structure,
String expected,
int maxRowCount,
@Nullable Comparator comparator,
Object rootNode,
@Nullable Queryable.PrintInfo printInfo) {
checkGetParentConsistency(structure, rootNode);
String actual = PlatformTestUtil.print(structure, rootNode, 0, comparator, maxRowCount, ' ', printInfo).toString();
Assert.assertEquals(expected, actual);
}
protected static boolean isExpanded(DefaultMutableTreeNode nodeForElement, AbstractProjectViewPSIPane pane) {
TreePath path = new TreePath(nodeForElement.getPath());
return pane.getTree().isExpanded(path.getParentPath());
}
protected static DefaultMutableTreeNode getNodeForElement(PsiElement element, AbstractProjectViewPSIPane pane) {
JTree tree = pane.getTree();
TreeModel model = tree.getModel();
Object root = model.getRoot();
return getNodeForElement(root, model, element);
}
private static DefaultMutableTreeNode getNodeForElement(Object root, TreeModel model, PsiElement element) {
if (root instanceof DefaultMutableTreeNode) {
Object userObject = ((DefaultMutableTreeNode)root).getUserObject();
if (userObject instanceof AbstractTreeNode) {
AbstractTreeNode treeNode = (AbstractTreeNode)userObject;
if (element.equals(treeNode.getValue())) return (DefaultMutableTreeNode)root;
for (int i = 0; i < model.getChildCount(root); i++) {
DefaultMutableTreeNode nodeForChild = getNodeForElement(model.getChild(root, i), model, element);
if (nodeForChild != null) return nodeForChild;
}
}
}
return null;
}
public static void checkNavigateFromSourceBehaviour(PsiElement element, VirtualFile virtualFile, AbstractProjectViewPSIPane pane) {
Disposer.dispose(pane);
pane.createComponent();
Assert.assertNull(getNodeForElement(element, pane));
pane.select(element, virtualFile, true);
Assert.assertTrue(isExpanded(element, pane));
}
public static boolean isExpanded(PsiElement element, AbstractProjectViewPSIPane pane) {
DefaultMutableTreeNode nodeForElement = getNodeForElement(element, pane);
return nodeForElement != null && isExpanded((DefaultMutableTreeNode)nodeForElement.getParent(), pane);
}
}
plugins/properties/testData/propertiesFile/projectView/bundle/X.java
+3
View File
@@ -0,0 +1,3 @@
class X {
String s= "a.b";
}
plugins/properties/testData/propertiesFile/projectView/bundle/xxx.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/bundle/xxx_en.properties
+1
View File
@@ -0,0 +1 @@
a.b=
plugins/properties/testData/propertiesFile/projectView/bundle/xxx_ru_RU.properties
+1
View File
@@ -0,0 +1 @@
a.b=ee ry
plugins/properties/testData/propertiesFile/projectView/bundle/yyy.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/sortByType/X.java
+3
View File
@@ -0,0 +1,3 @@
class X {
String s= "a.b";
}
plugins/properties/testData/propertiesFile/projectView/sortByType/a.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/sortByType/xxx.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/sortByType/xxx2.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/sortByType/xxx_en.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/sortByType/yyy.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/standAlone/X.java
+3
View File
@@ -0,0 +1,3 @@
class X {
String s= "a.b";
}
plugins/properties/testData/propertiesFile/projectView/standAlone/a.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/standAlone/xxx.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/standAlone/xxx2.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testData/propertiesFile/projectView/standAlone/yyy.properties
+1
View File
@@ -0,0 +1 @@
a.b=ccc
plugins/properties/testSrc/com/intellij/lang/properties/PropertiesProjectViewTest.java
+114
View File
@@ -0,0 +1,114 @@
package com.intellij.lang.properties;
import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
import com.intellij.ide.projectView.impl.GroupByTypeComparator;
import com.intellij.lang.properties.projectView.ResourceBundleGrouper;
import com.intellij.openapi.application.PluginPathManager;
import com.intellij.projectView.TestProjectTreeStructure;
import com.intellij.psi.PsiFile;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
public class PropertiesProjectViewTest extends LightPlatformCodeInsightFixtureTestCase {
private TestProjectTreeStructure myStructure;
public PropertiesProjectViewTest() {
PlatformTestCase.initPlatformLangPrefix();
}
@Override
protected void setUp() throws Exception {
super.setUp();
myStructure = new TestProjectTreeStructure(getProject(), myTestRootDisposable);
}
@Override
protected String getTestDataPath() {
return PluginPathManager.getPluginHomePath("properties") + "/testData/propertiesFile/projectView";
}
public void testBundle() {
myFixture.copyDirectoryToProject(getTestName(true), getTestName(true));
final AbstractProjectViewPSIPane pane = setupPane(true);
String structure = "-Project\n" +
" -PsiDirectory: src\n" +
" -PsiDirectory: bundle\n" +
" yyy.properties\n" +
" -Resource Bundle 'xxx'\n" +
" xxx.properties\n" +
" xxx_en.properties\n" +
" xxx_ru_RU.properties\n" +
" X.java\n" +
myStructure.getProjectFileRepresentation() +
" External Libraries\n";
PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
}
public void testStandAlone() {
myFixture.copyDirectoryToProject(getTestName(true), getTestName(true));
final AbstractProjectViewPSIPane pane = setupPane(true);
String structure = "-Project\n" +
" -PsiDirectory: src\n" +
" -PsiDirectory: standAlone\n" +
" a.properties\n" +
" xxx.properties\n" +
" xxx2.properties\n" +
" yyy.properties\n" +
" X.java\n" +
myStructure.getProjectFileRepresentation() +
" External Libraries\n";
PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
}
public void testSortByType() {
myFixture.copyDirectoryToProject(getTestName(true), getTestName(true));
AbstractProjectViewPSIPane pane = setupPane(true);
String structure = "-Project\n" +
" -PsiDirectory: src\n" +
" -PsiDirectory: sortByType\n" +
" a.properties\n" +
" xxx2.properties\n" +
" yyy.properties\n" +
" -Resource Bundle 'xxx'\n" +
" xxx.properties\n" +
" xxx_en.properties\n" +
" X.java\n" +
myStructure.getProjectFileRepresentation() +
" External Libraries\n";
PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
pane = setupPane(false);
structure = "-Project\n" +
" -PsiDirectory: src\n" +
" -PsiDirectory: sortByType\n" +
" a.properties\n" +
" X.java\n" +
" -Resource Bundle 'xxx'\n" +
" xxx.properties\n" +
" xxx_en.properties\n" +
" xxx2.properties\n" +
" yyy.properties\n" +
myStructure.getProjectFileRepresentation() +
" External Libraries\n";
PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
}
private AbstractProjectViewPSIPane setupPane(final boolean sortByType) {
myStructure.setProviders(new ResourceBundleGrouper(getProject()));
final AbstractProjectViewPSIPane pane = myStructure.createPane();
pane.getTreeBuilder().setNodeDescriptorComparator(new GroupByTypeComparator(sortByType));
// there should be xxx.properties in all test data
PsiFile psiFile = getPsiManager().findFile(myFixture.findFileInTempDir(getTestName(true) + "/xxx.properties"));
assert psiFile != null;
pane.select(psiFile, psiFile.getVirtualFile(), sortByType);
return pane;
}
}
plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java
+4 -3
View File
@@ -23,6 +23,7 @@ import com.intellij.projectView.BaseProjectViewTestCase;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiJavaFile;
import com.intellij.testFramework.ProjectViewTestUtil;
public class FormMergerTreeStructureProviderTest extends BaseProjectViewTestCase {
@@ -32,7 +33,7 @@ public class FormMergerTreeStructureProviderTest extends BaseProjectViewTestCase
}
public void testStandardProviders() {
final AbstractProjectViewPSIPane pane = createPane();
final AbstractProjectViewPSIPane pane = myStructure.createPane();
getProjectTreeStructure().setProviders(new ClassesTreeStructureProvider(myProject),
new FormMergerTreeStructureProvider(myProject));
@@ -48,11 +49,11 @@ public class FormMergerTreeStructureProviderTest extends BaseProjectViewTestCase
" PsiFile(plain text):Form1.form\n");
PsiClass psiClass = ((PsiJavaFile)getPackageDirectory().findFile("Form1.java")).getClasses()[0];
checkNavigateFromSourceBehaviour(psiClass, psiClass.getContainingFile().getVirtualFile(), pane);
ProjectViewTestUtil.checkNavigateFromSourceBehaviour(psiClass, psiClass.getContainingFile().getVirtualFile(), pane);
PsiFile psiFile = getPackageDirectory().findFile("Form1.form");
VirtualFile virtualFile = psiFile.getContainingFile().getVirtualFile();
checkNavigateFromSourceBehaviour(psiFile, virtualFile, pane);
ProjectViewTestUtil.checkNavigateFromSourceBehaviour(psiFile, virtualFile, pane);
}
}