NEW - bug 272097: cleanup fixme and todo comments

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

2 files changed, 13 insertions, 9 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
index 6178b9846..837c8fe6b 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
@@ -51,9 +51,10 @@ public class TaskPlanningEditorTest extends TestCase {
 		TasksUiPlugin.getTaskList().addTask(task);
 		TasksUiUtil.openTask(task);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		assertTrue(page.getActiveEditor() instanceof TaskEditor);
+		assertNotNull(page);
+		assertEquals(TaskEditor.class, page.getActiveEditor().getClass());
 		TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
-		assertTrue(taskEditor.getActivePageInstance() instanceof TaskPlanningEditor);
+		assertEquals(TaskPlanningEditor.class, taskEditor.getActivePageInstance().getClass());
 		TaskPlanningEditor editor = (TaskPlanningEditor) taskEditor.getActivePageInstance();
 		assertFalse(editor.isDirty());
 		editor.setNotes("notes");
@@ -73,9 +74,10 @@ public class TaskPlanningEditorTest extends TestCase {
 		TasksUiPlugin.getTaskList().addTask(task);
 		TasksUiUtil.openTask(task);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		assertTrue(page.getActiveEditor() instanceof TaskEditor);
+		assertNotNull(page);
+		assertEquals(TaskEditor.class, page.getActiveEditor().getClass());
 		TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
-		assertTrue(taskEditor.getActivePageInstance() instanceof TaskPlanningEditor);
+		assertEquals(TaskPlanningEditor.class, taskEditor.getActivePageInstance().getClass());
 		TaskPlanningEditor editor = (TaskPlanningEditor) taskEditor.getActivePageInstance();
 		assertFalse(editor.isDirty());
 		assertEquals(DESCRIPTION, editor.getDescription());
@@ -95,10 +97,10 @@ public class TaskPlanningEditorTest extends TestCase {
 		TasksUiPlugin.getTaskList().addTask(task);
 		TasksUiUtil.openTask(task);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		assertTrue(page.getActiveEditor() instanceof TaskEditor);
+		assertNotNull(page);
+		assertEquals(TaskEditor.class, page.getActiveEditor().getClass());
 		TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
-		assertTrue(taskEditor.getActivePageInstance() instanceof TaskPlanningEditor);
-
+		assertEquals(TaskPlanningEditor.class, taskEditor.getActivePageInstance().getClass());
 		TaskPlanningEditor editor = (TaskPlanningEditor) taskEditor.getActivePageInstance();
 		assertFalse(editor.isDirty());
 		editor.setDescription(NEW_DESCRIPTION);
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 b16a672a4..071911242 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
@@ -79,11 +79,13 @@ public class TasksUiUtilTest extends TestCase {
 	public void testOpenTaskFromTask() {
 		TasksUiUtil.openTask(cat1task1);
 		assertEquals(1, activePage.getEditorReferences().length);
-		assertTrue(activePage.getEditorReferences()[0].getEditor(true) instanceof TaskEditor);
+		IEditorPart editor = activePage.getEditorReferences()[0].getEditor(true);
+		assertNotNull(editor);
+		assertEquals(TaskEditor.class, editor);
 
 		TasksUiUtil.openTask(cat1task2);
 		assertEquals(2, activePage.getEditorReferences().length);
-		assertTrue(activePage.getEditorReferences()[0].getEditor(true) instanceof TaskEditor);
+		assertTrue(editor instanceof TaskEditor);
 		assertTrue(activePage.getEditorReferences()[1].getEditor(true) instanceof TaskEditor);
 	}