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

fix structure view tests

Browse Source
This commit is contained in:
Konstantin Bulenkov
2011-11-08 20:28:44 +01:00
parent b73d91747a
commit 1a7bf7306c
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java
+10 -10
View File
@@ -32,19 +32,17 @@
package com.intellij.projectView;
import com.intellij.JavaTestUtil;
import com.intellij.ide.structureView.impl.java.InheritedMembersFilter;
import com.intellij.ide.structureView.impl.java.JavaInheritedMembersNodeProvider;
import com.intellij.ide.structureView.impl.java.PublicElementsFilter;
import com.intellij.ide.structureView.impl.java.VisibilitySorter;
import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.JavaDirectoryService;
import com.intellij.psi.PsiClass;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.TestSourceBasedTestCase;
import javax.swing.*;
@@ -59,6 +57,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
dotest(new CheckAction() {
@Override
public void testClassStructure(StructureViewComponent structureViewComponent) {
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, true);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(),
"-Class1.java\n" +
" -Class1\n" +
@@ -77,9 +76,9 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
" myField1:boolean\n" +
" myField2:boolean\n");
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(InheritedMembersFilter.ID, false);
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
" -Class1\n" +
@@ -110,6 +109,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
dotest(new CheckAction() {
@Override
public void testClassStructure(StructureViewComponent structureViewComponent) {
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, true);
final JTree tree = structureViewComponent.getTree();
tree.collapseRow(2);
IdeaTestUtil.assertTreeEqual(tree, "-Class2.java\n" +
@@ -133,7 +133,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
" myField3:boolean\n" +
" myField4:boolean\n");
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +
@@ -152,7 +152,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
dotest(new CheckAction() {
@Override
public void testClassStructure(StructureViewComponent structureViewComponent) {
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +
@@ -175,7 +175,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
dotest(new CheckAction() {
@Override
public void testClassStructure(StructureViewComponent structureViewComponent) {
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeBuilderTest.java
+4 -3
View File
@@ -1,7 +1,7 @@
package com.intellij.projectView;
import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
import com.intellij.ide.structureView.impl.java.InheritedMembersFilter;
import com.intellij.ide.structureView.impl.java.JavaInheritedMembersNodeProvider;
import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -90,7 +90,7 @@ public class ProjectTreeBuilderTest extends BaseProjectViewTestCase {
try {
structureViewComponent = (StructureViewComponent)fileEditors[0].getStructureViewBuilder().createStructureView(fileEditors[0], myProject);
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
TreeUtil.collapseAll(structureViewComponent.getTree(), -1);
@@ -114,6 +114,7 @@ public class ProjectTreeBuilderTest extends BaseProjectViewTestCase {
" myField3:boolean\n" +
" myField4:boolean\n";
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(),
expected);
@@ -122,7 +123,7 @@ public class ProjectTreeBuilderTest extends BaseProjectViewTestCase {
final FileEditor fileEditor = fileEditors[0];
structureViewComponent2 = (StructureViewComponent)fileEditor.getStructureViewBuilder().createStructureView(fileEditor, myProject);
structureViewComponent2.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent2.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent2.getTree(), expected);
}
finally {
java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java
+3 -2
View File
@@ -32,7 +32,7 @@
package com.intellij.projectView;
import com.intellij.JavaTestUtil;
import com.intellij.ide.structureView.impl.java.InheritedMembersFilter;
import com.intellij.ide.structureView.impl.java.JavaInheritedMembersNodeProvider;
import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
@@ -68,6 +68,7 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
final StructureViewComponent structureViewComponent =
(StructureViewComponent)fileEditor.getStructureViewBuilder().createStructureView(fileEditor, myProject);
final Document document = PsiDocumentManager.getInstance(myProject).getDocument(psiClass.getContainingFile());
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, true);
PlatformTestUtil.assertTreeEqual(structureViewComponent.getTree(),
"-Class1.java\n" +
" -Class1\n" +
@@ -135,7 +136,7 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
final StructureViewComponent structureViewComponent =
(StructureViewComponent)fileEditor.getStructureViewBuilder().createStructureView(fileEditor, myProject);
try {
structureViewComponent.setActionActive(InheritedMembersFilter.ID, true);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
PlatformTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +