Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2007-06-13 08:00:39 +0000
committermkersten2007-06-13 08:00:39 +0000
commit883219bedc7c4bd2ae6ceede524c9cb3abdd4e00 (patch)
treed0a0f6bb45193a3314d824367b6b6f81014d288d /org.eclipse.mylyn.bugzilla.tests
parentf2fb9bb4cd1e7b9906b9cccc96ba519f116c975a (diff)
downloadorg.eclipse.mylyn.tasks-883219bedc7c4bd2ae6ceede524c9cb3abdd4e00.tar.gz
org.eclipse.mylyn.tasks-883219bedc7c4bd2ae6ceede524c9cb3abdd4e00.tar.xz
org.eclipse.mylyn.tasks-883219bedc7c4bd2ae6ceede524c9cb3abdd4e00.zip
NEW - bug 124321: [api] merge local tasks with repository tasks
https://bugs.eclipse.org/bugs/show_bug.cgi?id=124321
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.tests')
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java14
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java28
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java10
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java21
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java20
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java10
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java16
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java18
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java16
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java10
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java4
13 files changed, 87 insertions, 88 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
index 946e9cee5..29fa51c52 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
@@ -24,13 +24,13 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.ITaskFactory;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
import org.eclipse.mylyn.tasks.ui.TaskFactory;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -49,7 +49,7 @@ public abstract class AbstractBugzillaTest extends TestCase {
protected TaskRepository repository;
- protected TaskList taskList;
+ protected getAllCategories taskList;
protected ITaskFactory taskFactory;
@@ -119,7 +119,7 @@ public abstract class AbstractBugzillaTest extends TestCase {
return task;
}
- protected void submit(AbstractRepositoryTask task, RepositoryTaskData taskData) throws CoreException {
+ protected void submit(AbstractTask task, RepositoryTaskData taskData) throws CoreException {
connector.getTaskDataHandler().postTaskData(repository, taskData, new NullProgressMonitor());
task.setSubmitting(true);
}
@@ -132,8 +132,8 @@ public abstract class AbstractBugzillaTest extends TestCase {
// repository.getPassword(), repository.getCharacterEncoding());
// }
- protected void synchAndAssertState(Set<AbstractRepositoryTask> tasks, RepositoryTaskSyncState state) {
- for (AbstractRepositoryTask task : tasks) {
+ protected void synchAndAssertState(Set<AbstractTask> tasks, RepositoryTaskSyncState state) {
+ for (AbstractTask task : tasks) {
TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
assertEquals(task.getSyncState(), state);
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index 09a91f058..1b76096ed 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -31,12 +31,12 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.core.RepositoryConfiguration;
import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.LocalAttachment;
import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.ui.search.RepositorySearchResult;
import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
@@ -63,13 +63,13 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
TasksUiPlugin.getSynchronizationManager().synchronize(connector, bugQuery, null, false);
assertEquals(1, bugQuery.getHits().size());
- AbstractRepositoryTask hit = (AbstractRepositoryTask) bugQuery.getHits().toArray()[0];
+ AbstractTask hit = (AbstractTask) bugQuery.getHits().toArray()[0];
assertTrue(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(hit.getHandleIdentifier()) != null);
TasksUiPlugin.getDefault().getTaskDataManager().remove(hit.getHandleIdentifier());
TasksUiPlugin.getSynchronizationManager().synchronize(connector, bugQuery, null, true);
assertEquals(1, bugQuery.getHits().size());
- hit = (AbstractRepositoryTask) bugQuery.getHits().toArray()[0];
+ hit = (AbstractTask) bugQuery.getHits().toArray()[0];
assertTrue(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(hit.getHandleIdentifier()) != null);
}
@@ -121,7 +121,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
collector.run(new NullProgressMonitor());
assertEquals(2, result.getElements().length);
- for (AbstractRepositoryTask hit : collector.getTaskHits()) {
+ for (AbstractTask hit : collector.getTaskHits()) {
assertTrue(hit.getSummary().contains("search-match-test"));
}
@@ -253,8 +253,8 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
assertEquals(2, taskList.getQueries().size());
assertEquals(1, taskList.getAllTasks().size());
- for (AbstractRepositoryTask hit : query1.getHits()) {
- for (AbstractRepositoryTask hit2 : query2.getHits()) {
+ for (AbstractTask hit : query1.getHits()) {
+ for (AbstractTask hit2 : query2.getHits()) {
assertTrue(hit.getClass().equals(hit2.getClass()));
}
}
@@ -375,7 +375,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task5.getSyncState());
assertEquals("5", taskData5.getId());
- Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
+ Set<AbstractTask> tasks = new HashSet<AbstractTask>();
tasks.add(task4);
tasks.add(task5);
@@ -386,7 +386,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastSyncDateStamp(),
TasksUiPlugin.getDefault().getRepositoriesFilePath());
- Set<AbstractRepositoryTask> changedTasks = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());
+ Set<AbstractTask> changedTasks = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());
// Always last known changed returned
assertEquals(1, changedTasks.size());
@@ -421,7 +421,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
TasksUiPlugin.getSynchronizationManager().synchronize(connector, changedTasks, true, null);
- for (AbstractRepositoryTask task : changedTasks) {
+ for (AbstractTask task : changedTasks) {
if (task.getTaskId() == "4") {
assertEquals(priority4, task4.getPriority());
}
@@ -442,7 +442,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task7.getSyncState());
assertEquals("7", recentTaskData.getId());
- Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
+ Set<AbstractTask> tasks = new HashSet<AbstractTask>();
tasks.add(task7);
TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task7.getLastSyncDateStamp(),
@@ -513,7 +513,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
assertEquals(taskid + "", bugtaskdata.getId());
assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, bugtask.getSyncState());
- Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
+ Set<AbstractTask> tasks = new HashSet<AbstractTask>();
tasks.add(bugtask);
// synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
@@ -522,7 +522,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
TasksUiPlugin.getDefault().getRepositoriesFilePath());
// connector.synchronizeChanged(repository);
- // Set<AbstractRepositoryTask> changedTasks =
+ // Set<AbstractTask> changedTasks =
// connector.getOfflineTaskHandler().getChangedSinceLastSync(repository,
// tasks);
// assertEquals(1, changedTasks.size());
@@ -553,7 +553,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
if (enableDeadline)
bugtaskdata.setAttributeValue(BugzillaReportElement.DEADLINE.getKeyString(), deadline);
- for (AbstractRepositoryTask task : tasks) {
+ for (AbstractTask task : tasks) {
RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
task.getHandleIdentifier());
taskData.setAttributeValue(BugzillaReportElement.ADD_COMMENT.getKeyString(), "New Estimate: "
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
index 4b6e1d5f1..6b733ec2b 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
@@ -20,9 +20,9 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TaskFactory;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -100,11 +100,11 @@ public class BugzillaSearchEngineTest extends TestCase {
.toString());
TasksUiPlugin.getRepositoryManager().addRepository(repository,
TasksUiPlugin.getDefault().getRepositoriesFilePath());
- Set<AbstractRepositoryTask> hits = runQuery(IBugzillaConstants.TEST_BUGZILLA_222_URL, SEARCH_DESCRIPTION);
+ Set<AbstractTask> hits = runQuery(IBugzillaConstants.TEST_BUGZILLA_222_URL, SEARCH_DESCRIPTION);
assertEquals(NUM_EXPECTED_HITS, hits.size());
}
- private Set<AbstractRepositoryTask> runQuery(String repositoryURL, String SearchString) throws Exception {
+ private Set<AbstractTask> runQuery(String repositoryURL, String SearchString) throws Exception {
TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
BugzillaCorePlugin.REPOSITORY_KIND, repositoryURL);
assertNotNull(repository);
@@ -115,7 +115,7 @@ public class BugzillaSearchEngineTest extends TestCase {
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
BugzillaCorePlugin.REPOSITORY_KIND);
- TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+ getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector, false);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
index 248911b0f..e125b48e8 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
@@ -23,12 +23,11 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
import org.eclipse.mylyn.tasks.ui.TaskListManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -80,12 +79,12 @@ public class BugzillaTaskListManagerTest extends TestCase {
TasksUiPlugin.getTaskListManager().resetTaskList();
TasksUiPlugin.getTaskListManager().readExistingOrCreateNewList();
- TaskList taskList = manager.getTaskList();
+ getAllCategories taskList = manager.getTaskList();
assertEquals(1, taskList.getAllTasks().size());
- Set<AbstractRepositoryTask> tasksReturned = taskList.getRepositoryTasks(repositoryUrl);
+ Set<AbstractTask> tasksReturned = taskList.getRepositoryTasks(repositoryUrl);
assertNotNull(tasksReturned);
assertEquals(1, tasksReturned.size());
- for (AbstractRepositoryTask task : tasksReturned) {
+ for (AbstractTask task : tasksReturned) {
assertTrue(task.hasBeenReminded());
}
}
@@ -102,7 +101,7 @@ public class BugzillaTaskListManagerTest extends TestCase {
// manager.setTaskList(list);
manager.readExistingOrCreateNewList();
assertEquals(1, manager.getTaskList().getRootTasks().size());
- AbstractRepositoryTask readTask = (AbstractRepositoryTask) manager.getTaskList().getRootTasks().iterator()
+ AbstractTask readTask = (AbstractTask) manager.getTaskList().getRootTasks().iterator()
.next();
assertEquals(repositoryTask.getHandleIdentifier(), readTask.getHandleIdentifier());
@@ -165,10 +164,10 @@ public class BugzillaTaskListManagerTest extends TestCase {
manager.readExistingOrCreateNewList();
manager.setTaskListFile(originalFile);
- Collection<ITask> allTasks = manager.getTaskList().getAllTasks();
- Set<ITask> allRootTasks = manager.getTaskList().getRootTasks();
+ Collection<AbstractTask> allTasks = manager.getTaskList().getAllTasks();
+ Set<AbstractTask> allRootTasks = manager.getTaskList().getRootTasks();
Set<AbstractTaskContainer> allCategories = manager.getTaskList().getCategories();
- Set<ITaskListElement> allRoots = manager.getTaskList().getRootElements();
+ Set<AbstractTaskListElement> allRoots = manager.getTaskList().getRootElements();
assertEquals(0, allRootTasks.size());
manager.saveTaskList();
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
index e7058a2aa..3d1039c0a 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
@@ -24,7 +24,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskComment;
@@ -53,7 +53,7 @@ public class BugzillaTaskTest extends TestCase {
public void testCompletionDate() throws Exception {
BugzillaTask task = new BugzillaTask("repo", "1", "summary");
RepositoryTaskData taskData = new RepositoryTaskData(new BugzillaAttributeFactory(),
- BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, "1", AbstractTask.DEFAULT_TASK_KIND);
//XXX rewrite test
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
index fc191281d..b8d948a67 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
@@ -17,7 +17,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.NewBugzillaTaskEditor;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -47,7 +47,7 @@ public class DuplicateDetetionTest extends TestCase {
String stackTrace = "java.lang.NullPointerException\nat jeff.testing.stack.trace.functionality(jeff.java:481)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
@@ -65,7 +65,7 @@ public class DuplicateDetetionTest extends TestCase {
public void testNoStackTrace() throws Exception {
String fakeStackTrace = "this is not really a stacktrace";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(fakeStackTrace);
model.setNew(true);
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
@@ -86,7 +86,7 @@ public class DuplicateDetetionTest extends TestCase {
String extraText = "\nExtra text that isnt' part of the stack trace java:";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(extraText + "\n" + stackTrace + "\n");
model.setNew(true);
@@ -116,7 +116,7 @@ public class DuplicateDetetionTest extends TestCase {
"at org.eclipse.jdt.internal.core.JavaElement\n.getURLContents(JavaElement.java:734)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
@@ -145,7 +145,7 @@ public class DuplicateDetetionTest extends TestCase {
" at org.eclipse.jdt.internal.core.JavaElement.getURLContents(JavaElement.java:734)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
@@ -170,7 +170,7 @@ public class DuplicateDetetionTest extends TestCase {
" at gnu.java.lang.MainThread.run() (/usr/lib/libgcj.so.6.0.0)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
@@ -194,7 +194,7 @@ public class DuplicateDetetionTest extends TestCase {
" at java.lang.reflect.Method.Invoke (Method.java)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
@@ -220,7 +220,7 @@ public class DuplicateDetetionTest extends TestCase {
" at java/util/logging/LogManager.readConfiguration(L:555)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
@@ -245,7 +245,7 @@ public class DuplicateDetetionTest extends TestCase {
" at java.lang.VirtualMachine.main (VirtualMachine.java:108)";
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setDescription(stackTrace);
model.setNew(true);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java
index e018945cf..5ac6259ef 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java
@@ -19,7 +19,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -32,7 +32,7 @@ public class NewBugWizardTest extends TestCase {
public void testPlatformOptions() throws Exception {
- RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1", AbstractTask.DEFAULT_TASK_KIND);
TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
IBugzillaConstants.TEST_BUGZILLA_220_URL);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
index 1f2320d06..90684a31f 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
@@ -14,12 +14,12 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditor;
import org.eclipse.mylyn.tasks.ui.editors.NewTaskEditorInput;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.ui.IWorkbenchPage;
@@ -59,7 +59,7 @@ public class TaskEditorTest extends TestCase {
RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
- .getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ .getTaskDataManager().getNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
model.setNew(true);
BugzillaRepositoryConnector.setupNewBugAttributes(repository, model);
NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model);
@@ -67,8 +67,8 @@ public class TaskEditorTest extends TestCase {
TasksUiUtil.openEditor(editorInput, TaskEditor.ID_EDITOR, page);
assertTrue(page.getActiveEditor() instanceof TaskEditor);
TaskEditor taskEditor = (TaskEditor) page.getActiveEditor();
- assertTrue(taskEditor.getActivePageInstance() instanceof AbstractRepositoryTaskEditor);
- AbstractRepositoryTaskEditor editor = (AbstractRepositoryTaskEditor) taskEditor.getActivePageInstance();
+ assertTrue(taskEditor.getActivePageInstance() instanceof AbstractTaskEditor);
+ AbstractTaskEditor editor = (AbstractTaskEditor) taskEditor.getActivePageInstance();
String desc = DESCRIPTION;
String summary = "summary";
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
index 5c02ede84..a2114f267 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
@@ -21,10 +21,10 @@ import org.eclipse.mylyn.internal.tasks.core.LocalTask;
import org.eclipse.mylyn.internal.tasks.ui.ITaskListNotification;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationIncoming;
import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationManager;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
/**
@@ -46,9 +46,9 @@ public class TaskListNotificationManagerTest extends TestCase {
Date now = new Date();
- ITask task0 = new LocalTask("0", "t0 - test 0");
- ITask task1 = new LocalTask("1", "t1 - test 1");
- ITask task2 = new LocalTask("2", "t2 - test 2");
+ AbstractTask task0 = new LocalTask("0", "t0 - test 0");
+ AbstractTask task1 = new LocalTask("1", "t1 - test 1");
+ AbstractTask task2 = new LocalTask("2", "t2 - test 2");
task0.setScheduledForDate(new Date(now.getTime() - 2000));
task1.setScheduledForDate(new Date(now.getTime() - 2000));
@@ -78,14 +78,14 @@ public class TaskListNotificationManagerTest extends TestCase {
TaskRepository repository = new TaskRepository("bugzilla", "https://bugs.eclipse.org/bugs");
TasksUiPlugin.getRepositoryManager().addRepository(repository,
TasksUiPlugin.getDefault().getRepositoriesFilePath());
- AbstractRepositoryTask task = new BugzillaTask("https://bugs.eclipse.org/bugs", "142891", "label");
+ AbstractTask task = new BugzillaTask("https://bugs.eclipse.org/bugs", "142891", "label");
assertEquals( RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState());
assertFalse(task.isNotified());
TasksUiPlugin.getTaskListManager().getTaskList().addTask(task);
TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault().getTaskListNotificationManager();
notificationManager.collectNotifications();
assertTrue(notificationManager.getNotifications().contains(new TaskListNotificationIncoming(task)));
- task = (AbstractRepositoryTask) TasksUiPlugin.getTaskListManager().getTaskList().getTask(
+ task = (AbstractTask) TasksUiPlugin.getTaskListManager().getTaskList().getTask(
"https://bugs.eclipse.org/bugs-142891");
assertNotNull(task);
assertTrue(task.isNotified());
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
index 27f9366ee..2be2f0bb3 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
@@ -24,8 +24,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaTaskExternalizer;
import org.eclipse.mylyn.internal.tasks.core.LocalTask;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.ITaskListExternalizer;
import org.eclipse.mylyn.tasks.ui.TaskListManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -60,7 +60,7 @@ public class TaskListStandaloneTest extends TestCase {
}
public void testDueDateExternalization() {
- ITask task = new LocalTask("1", "task 1");
+ AbstractTask task = new LocalTask("1", "task 1");
Date dueDate = new Date();
task.setDueDate(dueDate);
manager.getTaskList().moveToRoot(task);
@@ -70,14 +70,14 @@ public class TaskListStandaloneTest extends TestCase {
manager.resetTaskList();
manager.readExistingOrCreateNewList();
assertEquals(1, manager.getTaskList().getAllTasks().size());
- Set<ITask> readList = manager.getTaskList().getRootTasks();
- ITask readTask = readList.iterator().next();
+ Set<AbstractTask> readList = manager.getTaskList().getRootTasks();
+ AbstractTask readTask = readList.iterator().next();
assertTrue(readTask.getSummary().equals("task 1"));
assertTrue(readTask.getDueDate().compareTo(dueDate) == 0);
}
public void testPastReminder() {
- ITask task = new LocalTask("1", "1");
+ AbstractTask task = new LocalTask("1", "1");
long now = new Date().getTime();
task.setScheduledForDate(new Date(now - 1000));
assertTrue(task.isPastReminder());
@@ -93,7 +93,7 @@ public class TaskListStandaloneTest extends TestCase {
public void testDates() {
Date start = Calendar.getInstance().getTime();
Date creation = new Date();
- AbstractRepositoryTask task = new LocalTask("1", "task 1");
+ AbstractTask task = new LocalTask("1", "task 1");
manager.getTaskList().moveToRoot(task);
assertDatesCloseEnough(task.getCreationDate(), start);
@@ -115,8 +115,8 @@ public class TaskListStandaloneTest extends TestCase {
// assertNotNull(manager.getTaskList());
assertEquals(1, manager.getTaskList().getRootTasks().size());
- Set<ITask> readList = manager.getTaskList().getRootTasks();
- ITask readTask = readList.iterator().next();
+ Set<AbstractTask> readList = manager.getTaskList().getRootTasks();
+ AbstractTask readTask = readList.iterator().next();
assertTrue(readTask.getSummary().equals("task 1"));
assertEquals("should be: " + creation, task.getCreationDate(), readTask.getCreationDate());
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java
index f6f198d33..1b4d2ea19 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java
@@ -23,8 +23,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylyn.internal.tasks.ui.planner.CompletedTaskCollector;
import org.eclipse.mylyn.internal.tasks.ui.planner.TaskReportGenerator;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
import org.eclipse.mylyn.tasks.core.TaskCategory;
import org.eclipse.mylyn.tasks.ui.TaskListManager;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -55,7 +55,7 @@ public class TaskReportGeneratorTest extends TestCase {
}
public void testCompletedTasksRetrieved() throws InvocationTargetException, InterruptedException {
- AbstractRepositoryTask task1 = manager.createNewLocalTask("task 1");
+ AbstractTask task1 = manager.createNewLocalTask("task 1");
manager.getTaskList().moveToRoot(task1);
CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0));
@@ -71,7 +71,7 @@ public class TaskReportGeneratorTest extends TestCase {
}
public void testCompletedTasksDateBoundsRetrieved() throws InvocationTargetException, InterruptedException {
- AbstractRepositoryTask task1 = manager.createNewLocalTask("task 1");
+ AbstractTask task1 = manager.createNewLocalTask("task 1");
manager.getTaskList().moveToRoot(task1);
task1.setCompleted(true);
Thread.sleep(1000);
@@ -109,13 +109,13 @@ public class TaskReportGeneratorTest extends TestCase {
}
public void testCompletedTasksInCategoryRetrieved() throws InvocationTargetException, InterruptedException {
- AbstractRepositoryTask task1 = manager.createNewLocalTask("task 1");
+ AbstractTask task1 = manager.createNewLocalTask("task 1");
manager.getTaskList().moveToRoot(task1);
task1.setCompleted(true);
TaskCategory cat1 = new TaskCategory("TaskReportGeneratorTest Category");
manager.getTaskList().addCategory(cat1);
- Set<ITaskListElement> catagories = new HashSet<ITaskListElement>();
+ Set<AbstractTaskListElement> catagories = new HashSet<AbstractTaskListElement>();
catagories.add(cat1);
CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0));
@@ -138,7 +138,7 @@ public class TaskReportGeneratorTest extends TestCase {
TaskCategory cat1 = new TaskCategory("TaskReportGeneratorTest Category");
manager.getTaskList().addCategory(cat1);
- Set<ITaskListElement> catagories = new HashSet<ITaskListElement>();
+ Set<AbstractTaskListElement> catagories = new HashSet<AbstractTaskListElement>();
catagories.add(cat1);
CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0));
@@ -164,7 +164,7 @@ public class TaskReportGeneratorTest extends TestCase {
manager.getTaskList().addQuery(bugQuery);
- Set<ITaskListElement> catagories = new HashSet<ITaskListElement>();
+ Set<AbstractTaskListElement> catagories = new HashSet<AbstractTaskListElement>();
catagories.add(bugQuery);
CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0));
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
index 29c77f92d..4326296db 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
@@ -21,11 +21,11 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
import org.eclipse.mylyn.tasks.core.QueryHitCollector;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TaskFactory;
@@ -54,7 +54,7 @@ public class BugzillaQueryTest extends TestCase {
// BugzillaCorePlugin.REPOSITORY_KIND);
connector = new BugzillaRepositoryConnector();
- connector.init(new TaskList());
+ connector.init(new getAllCategories());
handler = connector.getTaskDataHandler();
repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
Credentials credentials = TestUtil.readCredentials();
@@ -131,14 +131,14 @@ public class BugzillaQueryTest extends TestCase {
+ "/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=search-match-test&product=TestProduct&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&deadlinefrom=&deadlineto=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=";
// holds onto actual hit objects
- TaskList taskList = new TaskList();
+ getAllCategories taskList = new getAllCategories();
QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
BugzillaRepositoryConnector connector = new BugzillaRepositoryConnector();
connector.init(taskList);
BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "summary");
connector.performQuery(query, repository, new NullProgressMonitor(), collector, false);
assertEquals(2, collector.getTaskHits().size());
- for (ITask hit : collector.getTaskHits()) {
+ for (AbstractTask hit : collector.getTaskHits()) {
assertTrue(hit.getSummary().contains("search-match-test"));
}
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java
index 055073c46..739d02fdc 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java
@@ -29,7 +29,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.history.AssignmentEvent;
import org.eclipse.mylyn.internal.bugzilla.core.history.ResolutionEvent;
import org.eclipse.mylyn.internal.bugzilla.core.history.StatusEvent;
import org.eclipse.mylyn.internal.bugzilla.core.history.TaskHistory;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
import org.eclipse.mylyn.tasks.core.TaskRepository;
public class BugzillaTaskHistoryTest extends AbstractBugzillaTest {
@@ -45,7 +45,7 @@ public class BugzillaTaskHistoryTest extends AbstractBugzillaTest {
public void setUp() throws Exception {
super.setUp();
connector = new BugzillaRepositoryConnector();
- connector.init(new TaskList());
+ connector.init(new getAllCategories());
repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
Credentials credentials = TestUtil.readCredentials();

Back to the top