From 1a7bf7306cd5a2d653b33f74a4d6e5cd619d62c6 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 8 Nov 2011 20:28:44 +0100 Subject: [PATCH] fix structure view tests --- .../projectView/JavaTreeStructureTest.java | 20 +++++++++---------- .../projectView/ProjectTreeBuilderTest.java | 7 ++++--- .../StructureViewUpdatingTest.java | 5 +++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java index ce1577e6dab0..727c6fdb039d 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java @@ -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" + diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeBuilderTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeBuilderTest.java index 743eba5eb2aa..cda059f7b730 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeBuilderTest.java @@ -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 { diff --git a/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java b/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java index 81a61b14b0ad..8780c23e9724 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java @@ -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" +