Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2013-02-08 22:10:18 +0000
committerSteffen Pingel2013-04-12 21:42:46 +0000
commitdf08d9f31a149377edb6b7d96e8d034e8972e98a (patch)
treee568d8a9120ca954458678039d17009969dca742 /org.eclipse.mylyn.tasks.tests
parent9272712034cda71f10525c6fb0dec3a3be321adb (diff)
downloadorg.eclipse.mylyn.tasks-df08d9f31a149377edb6b7d96e8d034e8972e98a.tar.gz
org.eclipse.mylyn.tasks-df08d9f31a149377edb6b7d96e8d034e8972e98a.tar.xz
org.eclipse.mylyn.tasks-df08d9f31a149377edb6b7d96e8d034e8972e98a.zip
400370: ensure UI extensions are initialized when running UI tests
Change-Id: I390caf2f39d0806829b2678165921f34ec53a028 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=400370
Diffstat (limited to 'org.eclipse.mylyn.tasks.tests')
-rw-r--r--org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksUiUtilTest.java30
2 files changed, 17 insertions, 14 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index 058d823c5..cff0ab053 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -32,6 +32,7 @@ Require-Bundle: org.junit,
org.eclipse.mylyn.tests.util
Import-Package: com.sun.syndication.feed.synd;version="0.9.0";resolution:=optional
Export-Package: org.eclipse.mylyn.tasks.tests;x-internal:=true,
+ org.eclipse.mylyn.tasks.tests.bugs;x-internal:=true,
org.eclipse.mylyn.tasks.tests.connector;x-internal:=true,
org.eclipse.mylyn.tasks.tests.core;x-internal:=true,
org.eclipse.mylyn.tasks.tests.data;x-internal:=true,
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 375a146a9..7c34fa720 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
@@ -28,6 +28,7 @@ import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
+import org.eclipse.mylyn.tests.util.TasksUiTestUtil;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
@@ -74,6 +75,8 @@ public class TasksUiUtilTest extends TestCase {
activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
assertTrue(activePage.closeAllEditors(false));
assertEquals(0, activePage.getEditorReferences().length);
+
+ TasksUiTestUtil.ensureTasksUiInitialization();
}
@Override
@@ -82,20 +85,19 @@ public class TasksUiUtilTest extends TestCase {
activePage.closeAllEditors(false);
}
- // FIXME re-enable test
-// public void testOpenTaskFromTask() {
-// TasksUiUtil.openTask(cat1task1);
-// assertEquals(1, activePage.getEditorReferences().length);
-// IEditorPart editor = activePage.getEditorReferences()[0].getEditor(true);
-// assertNotNull(editor);
-// assertEquals(TaskEditor.class, editor.getClass());
-//
-// TasksUiUtil.openTask(cat1task2);
-// assertEquals(2, activePage.getEditorReferences().length);
-// editor = activePage.getEditorReferences()[1].getEditor(true);
-// assertNotNull(editor);
-// assertEquals(TaskEditor.class, editor.getClass());
-// }
+ public void testOpenTaskFromTask() {
+ TasksUiUtil.openTask(cat1task1);
+ assertEquals(1, activePage.getEditorReferences().length);
+ IEditorPart editor = activePage.getEditorReferences()[0].getEditor(true);
+ assertNotNull(editor);
+ assertEquals(TaskEditor.class, editor.getClass());
+
+ TasksUiUtil.openTask(cat1task2);
+ assertEquals(2, activePage.getEditorReferences().length);
+ editor = activePage.getEditorReferences()[1].getEditor(true);
+ assertNotNull(editor);
+ assertEquals(TaskEditor.class, editor.getClass());
+ }
public void testOpenTaskFromString() {
if (!PlatformUiUtil.hasInternalBrowser()) {

Back to the top