NEW - bug 282336: fix failing tests for 3.2.1

https://bugs.eclipse.org/bugs/show_bug.cgi?id=282336

2 files changed, 7 insertions, 2 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
index 508322f48..aac836b33 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
@@ -189,6 +189,8 @@ public class TaskListUiTest extends TestCase {
 		int numListenersDuring = 0;
 		int numListenersAfter = 0;
 
+		TasksUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+
 		Set<ITaskListChangeListener> listeners = taskList.getChangeListeners();
 		numListenersBefore = listeners.size();
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksUiUtilTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksUiUtilTest.java
index dcd185adb..b085b4fe5 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksUiUtilTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksUiUtilTest.java
@@ -77,6 +77,8 @@ public class TasksUiUtilTest extends TestCase {
 	}
 
 	public void testOpenTaskFromTask() {
+		TasksUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+
 		TasksUiUtil.openTask(cat1task1);
 		assertEquals(1, activePage.getEditorReferences().length);
 		IEditorPart editor = activePage.getEditorReferences()[0].getEditor(true);
@@ -85,8 +87,9 @@ public class TasksUiUtilTest extends TestCase {
 
 		TasksUiUtil.openTask(cat1task2);
 		assertEquals(2, activePage.getEditorReferences().length);
-		assertTrue(editor instanceof TaskEditor);
-		assertTrue(activePage.getEditorReferences()[1].getEditor(true) instanceof TaskEditor);
+		editor = activePage.getEditorReferences()[1].getEditor(true);
+		assertNotNull(editor);
+		assertEquals(TaskEditor.class, editor.getClass());
 	}
 
 	public void testOpenTaskFromString() {