NEW - bug 212962: renamed query is dropped from the task working set

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

2 files changed, 56 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
index 5a0d39322..b4e009154 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
@@ -61,6 +61,7 @@ public class AllTasksTests {
 		suite.addTestSuite(TaskRepositoryLocationTest.class);
 		suite.addTestSuite(AbstractTaskDataHandlerTest.class);
 		suite.addTestSuite(OrphanedTasksTest.class);
+		suite.addTestSuite(TaskWorkingSetTest.class);
 		// $JUnit-END$
 
 		// suite.addTestSuite(BackgroundSaveTest.class);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskWorkingSetTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskWorkingSetTest.java
new file mode 100644
index 000000000..33e425bed
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskWorkingSetTest.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.mylyn.tasks.tests;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetUpdater;
+import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryQuery;
+import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
+import org.eclipse.ui.IWorkingSet;
+import org.eclipse.ui.IWorkingSetManager;
+import org.eclipse.ui.internal.Workbench;
+
+public class TaskWorkingSetTest extends TestCase {
+
+	public void testRenameQuery() {
+		MockRepositoryQuery query = new MockRepositoryQuery("description");
+		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		taskList.addQuery(query);
+
+		IWorkingSetManager workingSetManager = Workbench.getInstance().getWorkingSetManager();
+		IWorkingSet workingSet = workingSetManager.createWorkingSet(TaskWorkingSetUpdater.ID_TASK_WORKING_SET, new IAdaptable[] { query });
+		assertTrue(Arrays.asList(workingSet.getElements()).contains(query));
+		
+		TasksUiPlugin.getTaskListManager().getTaskList().deleteQuery(query);
+		query = new MockRepositoryQuery("newDescription");
+		TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);
+		assertTrue(Arrays.asList(workingSet.getElements()).contains(query));
+	}
+
+	public void testEditQuery() {
+		MockRepositoryQuery query = new MockRepositoryQuery("description");
+		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		taskList.addQuery(query);
+
+		IWorkingSetManager workingSetManager = Workbench.getInstance().getWorkingSetManager();
+		IWorkingSet workingSet = workingSetManager.createWorkingSet(TaskWorkingSetUpdater.ID_TASK_WORKING_SET, new IAdaptable[] { query });
+		assertTrue(Arrays.asList(workingSet.getElements()).contains(query));
+		
+		TasksUiPlugin.getTaskListManager().getTaskList().deleteQuery(query);
+		TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);
+		assertTrue(Arrays.asList(workingSet.getElements()).contains(query));
+	}
+
+}