NEW - bug 213544: fix failing tests for 2.3

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

4 files changed, 93 insertions, 81 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java
index 8407e8141..b3ab5aaed 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java
@@ -72,6 +72,8 @@ public class AttachmentJobTest extends TestCase {
 
 	@Override
 	protected void tearDown() throws Exception {
+		manager.removeRepository(repository, TasksUiPlugin.getDefault().getRepositoriesFilePath());
+		
 		if (statusHandler != null) {
 			StatusHandler.removeStatusHandler(statusHandler);
 		}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java
index 4b00a5a62..60c556ba5 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ProjectRepositoryAssociationTest.java
@@ -52,6 +52,9 @@ public class ProjectRepositoryAssociationTest extends TestCase {
 		assertNotNull(returnedRepository);
 		assertEquals(REPOSITORY_KIND, returnedRepository.getConnectorKind());
 		assertEquals(REPOSITORY_URL, returnedRepository.getUrl());
+		
+		TasksUiPlugin.getRepositoryManager().removeRepository(repository,
+				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 	}
 
 	public void testRepositoryForFolder() throws CoreException {
@@ -66,5 +69,8 @@ public class ProjectRepositoryAssociationTest extends TestCase {
 		assertNotNull(returnedRepository);
 		assertEquals(REPOSITORY_KIND, returnedRepository.getConnectorKind());
 		assertEquals(REPOSITORY_URL, returnedRepository.getUrl());
+
+		TasksUiPlugin.getRepositoryManager().removeRepository(repository,
+				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 	}
 }
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 59e38e8fb..d2bd1d550 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
@@ -82,83 +82,84 @@ public class TaskListUiTest extends TestCase {
 
 	@Override
 	public void setUp() throws PartInitException {
-		try {
-			TaskListView.openInActivePerspective();
-			manager = TasksUiPlugin.getTaskListManager();
-			cat1 = new TaskCategory("First Category");
-			manager.getTaskList().addCategory(cat1);
-			cat1task1 = manager.createNewLocalTask("task 1");
-			cat1task1.setPriority(PriorityLevel.P1.toString());
-			cat1task1.setCompleted(true);
-			manager.getTaskList().moveTask(cat1task1, cat1);
-
-			cat1task1sub1 = manager.createNewLocalTask("sub task 1");
-			cat1task1sub1.setPriority(PriorityLevel.P1.toString());
-			cat1task1sub1.setCompleted(true);
-			manager.getTaskList().addTask(cat1task1sub1, cat1task1);
-
-			cat1task2 = manager.createNewLocalTask("task 2");
-			cat1task2.setPriority(PriorityLevel.P2.toString());
-			cat1task2.addParentContainer(cat1);
-			manager.getTaskList().moveTask(cat1task2, cat1);
-
-			cat1task3 = manager.createNewLocalTask("task 3");
-			cat1task3.setPriority(PriorityLevel.P3.toString());
-			cat1task3.setCompleted(true);
-			cat1task3.addParentContainer(cat1);
-			manager.getTaskList().moveTask(cat1task3, cat1);
-
-			cat1task4 = manager.createNewLocalTask("task 4");
-			cat1task4.setPriority(PriorityLevel.P4.toString());
-			cat1task4.addParentContainer(cat1);
-			manager.getTaskList().moveTask(cat1task4, cat1);
-
-			cat1task5 = manager.createNewLocalTask("task 5");
-			cat1task5.setPriority(PriorityLevel.P5.toString());
-			cat1task5.setCompleted(true);
-			cat1task5.addParentContainer(cat1);
-			manager.getTaskList().moveTask(cat1task5, cat1);
-
-			assertEquals(cat1.getChildren().size(), 5);
-
-			cat2 = new TaskCategory("Second Category");
-
-			cat2task1 = manager.createNewLocalTask("task 1");
-			cat2task1.setPriority(PriorityLevel.P1.toString());
-			cat2task1.addParentContainer(cat2);
-			manager.getTaskList().moveTask(cat2task1, cat2);
-
-			cat2task1sub1 = manager.createNewLocalTask("sub task 1");
-			cat2task1sub1.setPriority(PriorityLevel.P1.toString());
-			manager.getTaskList().addTask(cat2task1sub1, cat2task1);
-
-			cat2task2 = manager.createNewLocalTask("task 2");
-			cat2task2.setPriority(PriorityLevel.P2.toString());
-			cat2task2.setCompleted(true);
-			cat2task2.addParentContainer(cat2);
-			manager.getTaskList().moveTask(cat2task2, cat2);
-
-			cat2task3 = manager.createNewLocalTask("task 3");
-			cat2task3.setPriority(PriorityLevel.P3.toString());
-			cat2task3.addParentContainer(cat2);
-			manager.getTaskList().moveTask(cat2task3, cat2);
-
-			cat2task4 = manager.createNewLocalTask("task 4");
-			cat2task4.setPriority(PriorityLevel.P4.toString());
-			cat2task4.setCompleted(true);
-			cat2task4.addParentContainer(cat2);
-			manager.getTaskList().moveTask(cat2task4, cat2);
-
-			cat2task5 = manager.createNewLocalTask("task 5");
-			cat2task5.setPriority(PriorityLevel.P5.toString());
-			cat2task5.addParentContainer(cat2);
-			manager.getTaskList().moveTask(cat2task5, cat2);
-
-			manager.getTaskList().addCategory(cat2);
-			manager.saveTaskList();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		TaskListView.openInActivePerspective();
+		manager = TasksUiPlugin.getTaskListManager();
+
+		// make sure no unfiled folders exist
+		TasksUiPlugin.getRepositoryManager().clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
+		manager.resetTaskList();
+		
+		cat1 = new TaskCategory("First Category");
+		manager.getTaskList().addCategory(cat1);
+		cat1task1 = manager.createNewLocalTask("task 1");
+		cat1task1.setPriority(PriorityLevel.P1.toString());
+		cat1task1.setCompleted(true);
+		manager.getTaskList().moveTask(cat1task1, cat1);
+
+		cat1task1sub1 = manager.createNewLocalTask("sub task 1");
+		cat1task1sub1.setPriority(PriorityLevel.P1.toString());
+		cat1task1sub1.setCompleted(true);
+		manager.getTaskList().addTask(cat1task1sub1, cat1task1);
+
+		cat1task2 = manager.createNewLocalTask("task 2");
+		cat1task2.setPriority(PriorityLevel.P2.toString());
+		cat1task2.addParentContainer(cat1);
+		manager.getTaskList().moveTask(cat1task2, cat1);
+
+		cat1task3 = manager.createNewLocalTask("task 3");
+		cat1task3.setPriority(PriorityLevel.P3.toString());
+		cat1task3.setCompleted(true);
+		cat1task3.addParentContainer(cat1);
+		manager.getTaskList().moveTask(cat1task3, cat1);
+
+		cat1task4 = manager.createNewLocalTask("task 4");
+		cat1task4.setPriority(PriorityLevel.P4.toString());
+		cat1task4.addParentContainer(cat1);
+		manager.getTaskList().moveTask(cat1task4, cat1);
+
+		cat1task5 = manager.createNewLocalTask("task 5");
+		cat1task5.setPriority(PriorityLevel.P5.toString());
+		cat1task5.setCompleted(true);
+		cat1task5.addParentContainer(cat1);
+		manager.getTaskList().moveTask(cat1task5, cat1);
+
+		assertEquals(cat1.getChildren().size(), 5);
+
+		cat2 = new TaskCategory("Second Category");
+
+		cat2task1 = manager.createNewLocalTask("task 1");
+		cat2task1.setPriority(PriorityLevel.P1.toString());
+		cat2task1.addParentContainer(cat2);
+		manager.getTaskList().moveTask(cat2task1, cat2);
+
+		cat2task1sub1 = manager.createNewLocalTask("sub task 1");
+		cat2task1sub1.setPriority(PriorityLevel.P1.toString());
+		manager.getTaskList().addTask(cat2task1sub1, cat2task1);
+
+		cat2task2 = manager.createNewLocalTask("task 2");
+		cat2task2.setPriority(PriorityLevel.P2.toString());
+		cat2task2.setCompleted(true);
+		cat2task2.addParentContainer(cat2);
+		manager.getTaskList().moveTask(cat2task2, cat2);
+
+		cat2task3 = manager.createNewLocalTask("task 3");
+		cat2task3.setPriority(PriorityLevel.P3.toString());
+		cat2task3.addParentContainer(cat2);
+		manager.getTaskList().moveTask(cat2task3, cat2);
+
+		cat2task4 = manager.createNewLocalTask("task 4");
+		cat2task4.setPriority(PriorityLevel.P4.toString());
+		cat2task4.setCompleted(true);
+		cat2task4.addParentContainer(cat2);
+		manager.getTaskList().moveTask(cat2task4, cat2);
+
+		cat2task5 = manager.createNewLocalTask("task 5");
+		cat2task5.setPriority(PriorityLevel.P5.toString());
+		cat2task5.addParentContainer(cat2);
+		manager.getTaskList().moveTask(cat2task5, cat2);
+
+		manager.getTaskList().addCategory(cat2);
+		manager.saveTaskList();
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
index d7e453225..019af5ab2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
@@ -83,6 +83,10 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 
 	@Override
 	public boolean performDrop(Object data) {
+		if (data == null) {
+			return false;
+		}
+		
 		Object currentTarget = getCurrentTarget();
 		List<AbstractTask> tasksToMove = new ArrayList<AbstractTask>();
 		if (isUrl(data) && createTaskFromUrl(data)) {
@@ -196,10 +200,9 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 				TaskActivityUtil.snapEndOfWorkDay(newSchedule);
 				TasksUiPlugin.getTaskActivityManager().setScheduledFor(task, newSchedule.getTime(), container.isCaptureFloating());
 			} else if (currentTarget == null) {
-//				TasksUiPlugin.getTaskListManager().getTaskList().moveTask(
-//						newTask,
-//						TasksUiPlugin.getTaskListManager().getTaskList().getOrphanContainer(
-//								LocalRepositoryConnector.REPOSITORY_URL));
+				TasksUiPlugin.getTaskListManager().getTaskList().moveTask(
+						newTask,
+						TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 			}
 		}