diff options
author | spingel | 2008-04-15 06:30:51 +0000 |
---|---|---|
committer | spingel | 2008-04-15 06:30:51 +0000 |
commit | aee2844686c66f787a907b7d982e55ad5f389baa (patch) | |
tree | cabc194d097501eb7a36d6afd75b7a7d09713d81 /org.eclipse.mylyn.tasks.tests | |
parent | 2cbdacf33bf6ccd973ffb8884a6c038b025beaf3 (diff) | |
download | org.eclipse.mylyn.tasks-aee2844686c66f787a907b7d982e55ad5f389baa.tar.gz org.eclipse.mylyn.tasks-aee2844686c66f787a907b7d982e55ad5f389baa.tar.xz org.eclipse.mylyn.tasks-aee2844686c66f787a907b7d982e55ad5f389baa.zip |
NEW - bug 226221: [api] implement task list modification rule mechanism
https://bugs.eclipse.org/bugs/show_bug.cgi?id=226221
Diffstat (limited to 'org.eclipse.mylyn.tasks.tests')
5 files changed, 49 insertions, 72 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OrphanedTasksTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OrphanedTasksTest.java index c7f296b68..081cfbc65 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OrphanedTasksTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/OrphanedTasksTest.java @@ -69,7 +69,7 @@ public class OrphanedTasksTest extends TestCase { taskList.addTask(newTask, category); //assertEquals(1, taskList.getOrphanContainers().size()); assertEquals(2, taskList.getCategories().size()); - taskList.removeFromCategory(category, newTask); + taskList.removeFromContainer(category, newTask); //assertEquals(taskList.getOrphanContainers().size(), 1); assertFalse(category.contains(newTask.getHandleIdentifier())); assertTrue(taskList.getDefaultCategory().contains(newTask.getHandleIdentifier())); @@ -102,10 +102,10 @@ public class OrphanedTasksTest extends TestCase { taskList.addQuery(mockQuery); taskList.addTask(mockTask, mockQuery); - taskList.removeFromQuery(mockQuery, mockTask); + taskList.removeFromContainer(mockQuery, mockTask); assertFalse(mockQuery.contains(mockTask.getHandleIdentifier())); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); } @@ -123,7 +123,7 @@ public class OrphanedTasksTest extends TestCase { taskList.addCategory(category); taskList.addTask(mockTask, category); assertTrue(category.contains(mockTask.getHandleIdentifier())); - taskList.removeFromQuery(mockQuery, mockTask); + taskList.removeFromContainer(mockQuery, mockTask); assertFalse(mockQuery.contains(mockTask.getHandleIdentifier())); assertEquals(2, taskList.getCategories().size()); @@ -131,8 +131,8 @@ public class OrphanedTasksTest extends TestCase { //* Repository tasks within a removed category that are not in a query should be orphaned. - taskList.removeFromCategory(category, mockTask); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + taskList.removeFromContainer(category, mockTask); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); } @@ -151,7 +151,7 @@ public class OrphanedTasksTest extends TestCase { assertEquals(2, taskList.getCategories().size()); assertTrue(taskList.getDefaultCategory().isEmpty()); taskList.deleteCategory(category); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); assertEquals(1, taskList.getCategories().size()); } @@ -165,10 +165,10 @@ public class OrphanedTasksTest extends TestCase { assertTrue(taskList.getQueries().size() > 0); taskList.addTask(mockTask, mockQuery); assertTrue(mockQuery.contains(mockTask.getHandleIdentifier())); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); taskList.deleteQuery(mockQuery); assertTrue(taskList.getQueries().size() == 0); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); } /** @@ -211,10 +211,10 @@ public class OrphanedTasksTest extends TestCase { taskList.addTask(mockTask, mockQuery); taskList.addTask(mockTask, mockQuery2); - taskList.removeFromQuery(mockQuery2, mockTask); + taskList.removeFromContainer(mockQuery2, mockTask); assertTrue(mockQuery2.isEmpty()); assertFalse(mockQuery.isEmpty()); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).isEmpty()); } /** @@ -238,14 +238,11 @@ public class OrphanedTasksTest extends TestCase { Set<AbstractTask> tasks = TasksUiPlugin.getTaskListManager().getTaskList().getRepositoryTasks( MockRepositoryConnector.REPOSITORY_URL); assertFalse(tasks.isEmpty()); - AbstractRepositoryQuery query = TasksUiPlugin.getTaskListManager() - .getTaskList() - .getParentQueries(mockTask) - .iterator() - .next(); + + AbstractRepositoryQuery query = (AbstractRepositoryQuery) mockTask.getParentContainers().iterator().next(); assertEquals(mockQuery, query); assertFalse(query.isEmpty()); - assertTrue(TasksUiPlugin.getTaskListManager().getTaskList().getOrphanContainer( + assertTrue(TasksUiPlugin.getTaskListManager().getTaskList().getUnmatchedContainer( MockRepositoryConnector.REPOSITORY_URL).isEmpty()); } @@ -275,15 +272,15 @@ public class OrphanedTasksTest extends TestCase { taskList.addQuery(mockQuery); taskList.addTask(mockTask, mockQuery); - taskList.removeFromQuery(mockQuery, mockTask); + taskList.removeFromContainer(mockQuery, mockTask); assertFalse(mockQuery.contains(mockTask.getHandleIdentifier())); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); taskList.refactorRepositoryUrl(MockRepositoryConnector.REPOSITORY_URL, MockRepositoryConnector.REPOSITORY_URL + "new"); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL + "new").contains( + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL + "new").contains( mockTask.getHandleIdentifier())); } @@ -295,23 +292,23 @@ public class OrphanedTasksTest extends TestCase { TasksUiPlugin.getTaskListManager().getTaskList().addTask(mockTask, mockQuery); TasksUiPlugin.getTaskListManager().getTaskList().addTask(mockTask2, mockTask); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask2.getHandleIdentifier())); assertNotNull(taskList.getTask(mockTask.getHandleIdentifier())); assertNotNull(taskList.getTask(mockTask2.getHandleIdentifier())); - assertNotNull(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL)); - taskList.removeFromQuery(mockQuery, mockTask); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertNotNull(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL)); + taskList.removeFromContainer(mockQuery, mockTask); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); assertTrue(mockTask.contains(mockTask2.getHandleIdentifier())); taskList.deleteTask(mockTask); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); // mockTask2 should be orphaned when the parent task is deleted - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask2.getHandleIdentifier())); } @@ -329,25 +326,25 @@ public class OrphanedTasksTest extends TestCase { TasksUiPlugin.getTaskListManager().getTaskList().addTask(mockTask2, mockTask); TasksUiPlugin.getTaskListManager().getTaskList().addTask(mockTask3, mockQuery); TasksUiPlugin.getTaskListManager().getTaskList().addTask(mockTask2, mockTask3); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask2.getHandleIdentifier())); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask3.getHandleIdentifier())); - taskList.removeFromQuery(mockQuery, mockTask); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + taskList.removeFromContainer(mockQuery, mockTask); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask.getHandleIdentifier())); assertTrue(mockTask.contains(mockTask2.getHandleIdentifier())); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask2.getHandleIdentifier())); - taskList.removeFromQuery(mockQuery, mockTask3); - assertTrue(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + taskList.removeFromContainer(mockQuery, mockTask3); + assertTrue(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask3.getHandleIdentifier())); assertTrue(mockTask3.contains(mockTask2.getHandleIdentifier())); - assertFalse(taskList.getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL).contains( + assertFalse(taskList.getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL).contains( mockTask2.getHandleIdentifier())); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java index 0f683b908..6d89fdd18 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java @@ -21,6 +21,7 @@ import org.eclipse.mylyn.internal.context.core.ContextCorePlugin; import org.eclipse.mylyn.internal.context.core.InteractionContext; import org.eclipse.mylyn.internal.context.core.InteractionContextScaling; import org.eclipse.mylyn.internal.context.core.LegacyActivityAdaptor; +import org.eclipse.mylyn.internal.tasks.core.ITaskListManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager; @@ -28,7 +29,6 @@ import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.monitor.core.InteractionEvent; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.ui.ITaskListManager; /** * @author Rob Elves diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java index a7e58646d..d2a3a4b39 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java @@ -46,7 +46,7 @@ public class TaskListDnDTest extends TestCase { super.tearDown(); manager.resetTaskList(); manager.saveTaskList(); - assertNull(manager.getTaskList().getActiveTask()); + assertNull(manager.getActiveTask()); } public void testisUrl() { diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java index 498ed042e..0f6cb6967 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java @@ -12,7 +12,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -26,7 +25,6 @@ import org.eclipse.mylyn.context.core.IInteractionContextManager; import org.eclipse.mylyn.internal.context.core.InteractionContext; import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector; import org.eclipse.mylyn.internal.tasks.core.LocalTask; -import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil; import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.TaskList; @@ -149,12 +147,12 @@ public class TaskListManagerTest extends TestCase { MockTask task = new MockTask("1"); task.setLastReadTimeStamp("now"); manager.getTaskList().moveTask(task, - manager.getTaskList().getOrphanContainer(LocalRepositoryConnector.REPOSITORY_URL)); + manager.getTaskList().getUnmatchedContainer(LocalRepositoryConnector.REPOSITORY_URL)); assertEquals(1, manager.getTaskList().getAllTasks().size()); manager.getTaskList().deleteTask(task); assertEquals(0, manager.getTaskList().getAllTasks().size()); manager.getTaskList().moveTask(task, - manager.getTaskList().getOrphanContainer(LocalRepositoryConnector.REPOSITORY_URL)); + manager.getTaskList().getUnmatchedContainer(LocalRepositoryConnector.REPOSITORY_URL)); assertEquals(1, manager.getTaskList().getAllTasks().size()); manager.saveTaskList(); @@ -404,7 +402,7 @@ public class TaskListManagerTest extends TestCase { AbstractTask task1 = new LocalTask("t1", "t1"); manager.getTaskList().moveTask(task1, - manager.getTaskList().getOrphanContainer(LocalRepositoryConnector.REPOSITORY_URL)); + manager.getTaskList().getUnmatchedContainer(LocalRepositoryConnector.REPOSITORY_URL)); assertEquals(1, manager.getTaskList().getDefaultCategory().getChildren().size()); assertEquals(manager.getTaskList().getDefaultCategory(), TaskCategory.getParentTaskCategory(task1)); @@ -416,19 +414,12 @@ public class TaskListManagerTest extends TestCase { assertEquals(cat1, TaskCategory.getParentTaskCategory(task1)); manager.getTaskList().moveTask(task1, - manager.getTaskList().getOrphanContainer(LocalRepositoryConnector.REPOSITORY_URL)); + manager.getTaskList().getUnmatchedContainer(LocalRepositoryConnector.REPOSITORY_URL)); assertEquals(1, manager.getTaskList().getDefaultCategory().getChildren().size()); assertEquals(0, cat1.getChildren().size()); assertEquals(manager.getTaskList().getDefaultCategory(), TaskCategory.getParentTaskCategory(task1)); } - public void testEmpty() { - manager.resetTaskList(); - assertTrue(manager.getTaskList().isEmpty()); - manager.getTaskList().addTask(new LocalTask("", "")); - assertFalse(manager.getTaskList().isEmpty()); - } - public void testCategoryPersistance() { MockTask task = new MockTask("1"); TaskCategory category = new TaskCategory("cat"); @@ -461,7 +452,7 @@ public class TaskListManagerTest extends TestCase { manager.getTaskList().addTask(task, category); assertEquals(0, manager.getTaskList().getDefaultCategory().getChildren().size()); manager.getTaskList().deleteCategory(category); - manager.getTaskList().getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL); + manager.getTaskList().getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL); } public void testRenameCategory() { @@ -582,7 +573,7 @@ public class TaskListManagerTest extends TestCase { manager.readExistingOrCreateNewList(); assertEquals(1, manager.getTaskList().getAllTasks().size()); assertEquals(1, manager.getTaskList() - .getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL) + .getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL) .getChildren() .size()); @@ -593,7 +584,7 @@ public class TaskListManagerTest extends TestCase { repositoryTask.setLastReadTimeStamp("now"); manager.getTaskList().addTask(repositoryTask); assertEquals(1, manager.getTaskList() - .getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL) + .getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL) .getChildren() .size()); manager.saveTaskList(); @@ -601,7 +592,7 @@ public class TaskListManagerTest extends TestCase { manager.resetTaskList(); manager.readExistingOrCreateNewList(); assertEquals(1, manager.getTaskList() - .getOrphanContainer(MockRepositoryConnector.REPOSITORY_URL) + .getUnmatchedContainer(MockRepositoryConnector.REPOSITORY_URL) .getChildren() .size()); } @@ -819,20 +810,11 @@ public class TaskListManagerTest extends TestCase { assertEquals(3, query2.getChildren().size()); - Set<AbstractRepositoryQuery> queriesReturned = taskList.getParentQueries(hit1); + Set<AbstractTaskContainer> queriesReturned = hit1.getParentContainers(); assertNotNull(queriesReturned); assertEquals(2, queriesReturned.size()); assertTrue(queriesReturned.contains(query1)); assertTrue(queriesReturned.contains(query2)); - - Set<String> handles = new HashSet<String>(); - handles.add(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2")); - Collection<AbstractTask> hitsReturned = taskList.getTasks(handles); - assertNotNull(hitsReturned); - assertEquals(1, hitsReturned.size()); - assertTrue(hitsReturned.contains(hit2)); - assertTrue(hitsReturned.contains(hit2twin)); - } // public void testQueryHitHasParent() { @@ -920,13 +902,13 @@ public class TaskListManagerTest extends TestCase { TaskList taskList = manager.getTaskList(); taskList.addTask(task1); taskList.addTask(task2); - assertNull(taskList.getActiveTask()); + assertNull(manager.getActiveTask()); manager.activateTask(task2); - assertEquals(task2, taskList.getActiveTask()); + assertEquals(task2, manager.getActiveTask()); manager.deactivateAllTasks(); - assertNull(taskList.getActiveTask()); + assertNull(manager.getActiveTask()); } public void testMarkTaskRead() { 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 636458ff4..a163963fc 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 @@ -78,8 +78,7 @@ public class TaskPlanningEditorTest extends TestCase { TaskPlanningEditor editor = (TaskPlanningEditor) taskEditor.getActivePageInstance(); assertFalse(editor.isDirty()); assertEquals(DESCRIPTION, editor.getDescription()); - TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, NEW_DESCRIPTION); - assertEquals(NEW_DESCRIPTION, task.getSummary()); + task.setSummary(NEW_DESCRIPTION); editor.updateTaskData(task); //assertEquals(NEW_DESCRIPTION, editor.getFormTitle()); assertEquals(NEW_DESCRIPTION, editor.getDescription()); @@ -102,8 +101,7 @@ public class TaskPlanningEditorTest extends TestCase { assertFalse(editor.isDirty()); editor.setDescription(NEW_DESCRIPTION); assertTrue(editor.isDirty()); - TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, NEW_DESCRIPTION + "2"); - assertEquals(NEW_DESCRIPTION + "2", task.getSummary()); + task.setSummary(NEW_DESCRIPTION + "2"); editor.updateTaskData(task); //assertEquals(NEW_DESCRIPTION+"2", editor.getFormTitle()); assertEquals(NEW_DESCRIPTION + "2", editor.getDescription()); |