419825: fix failures in JavaEditorManagerTest.testAutoCloseWithDecay()
Change-Id: I3fbb392a34cda1349475b2adfe0bac64053eccbf
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=419825
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java
index eb03b0e..8095f64 100644
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java
+++ b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/FocusViewActionTest.java
@@ -30,6 +30,7 @@
import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
import org.eclipse.mylyn.internal.java.ui.actions.FocusPackageExplorerAction;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -71,7 +72,6 @@
assertFalse(ContextCore.getContextManager().isContextCapturePaused());
}
- @SuppressWarnings("deprecation")
public void testContents() throws JavaModelException, PartInitException {
IMethod m1 = type1.createMethod("void m1() { }", null, true, null);
UiTestUtil.openView("org.eclipse.ui.views.ContentOutline");
@@ -79,9 +79,13 @@
// FocusOutlineAction.getDefault().update(true);
List<StructuredViewer> viewers = new ArrayList<StructuredViewer>();
- IEditorPart[] parts = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditors();
- for (IEditorPart part : parts) {
- if (part.getTitle().equals("Type1.java")) {
+ IEditorReference[] refrences = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow()
+ .getActivePage()
+ .getEditorReferences();
+ for (IEditorReference reference : refrences) {
+ if (reference.getTitle().equals("Type1.java")) {
+ IEditorPart part = reference.getEditor(true);
AbstractContextUiBridge bridge = ContextUi.getUiBridgeForEditor(part);
List<TreeViewer> outlineViewers = bridge.getContentOutlineViewers(part);
for (TreeViewer viewer : outlineViewers) {
diff --git a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditorManagerTest.java b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditorManagerTest.java
index dcc332f..d9d25b4 100644
--- a/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditorManagerTest.java
+++ b/org.eclipse.mylyn.java.tests/src/org/eclipse/mylyn/java/tests/JavaEditorManagerTest.java
@@ -145,10 +145,9 @@
assertEquals(0, tracker.getEditorListenerMap().size());
}
- @SuppressWarnings("deprecation")
public void testAutoCloseWithDecay() throws JavaModelException, InvocationTargetException, InterruptedException {
ContextUiPlugin.getEditorStateParticipant().closeAllEditors();
- assertEquals(0, page.getEditors().length);
+ assertEquals(0, page.getEditorReferences().length);
// create and open types
AbstractContextUiBridge bridge = ContextUi.getUiBridge(JavaStructureBridge.CONTENT_TYPE);
@@ -165,7 +164,7 @@
// opening editors can cause selection events on e4
context.reset();
- assertEquals(2, page.getEditors().length);
+ assertEquals(2, page.getEditorReferences().length);
// process a number of events to trigger decay
for (int i = 0; i < 1 / (scaling.getDecay()) * 3; i++) {
ContextCore.getContextManager().processInteractionEvent(mockSelection());
@@ -183,7 +182,7 @@
bridge.open(elementB);
// make type interesting
monitor.selectionChanged(view, new StructuredSelection(typeB));
- assertEquals(1, page.getEditors().length);
+ assertEquals(1, page.getEditorReferences().length);
}
}
