Fixed Bugzilla Bug 111945: Read-only activations of tasks

2 files changed, 32 insertions, 11 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java
index fdc0ca874..f9d348353 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java
@@ -83,11 +83,11 @@ public class TaskHistoryTest extends TestCase {
 	 * Tests the next task and previous task navigation.
 	 */
 	public void testBasicHistoryNavigation(){
-		(new TaskActivateAction(task1)).run();
+		(new TaskActivateAction()).run(task1);
 		taskView.addTaskToHistory(task1); 
-		(new TaskActivateAction(task2)).run();
+		(new TaskActivateAction()).run(task2);
 		taskView.addTaskToHistory(task2); 
-		(new TaskActivateAction(task3)).run();
+		(new TaskActivateAction()).run(task3);
 		taskView.addTaskToHistory(task3);
 		
 		assertTrue(task3.isActive());
@@ -117,7 +117,7 @@ public class TaskHistoryTest extends TestCase {
 		taskView.getNextTaskAction().run();
 		assertTrue(task3.isActive());
 		
-		(new TaskActivateAction(task4)).run();
+		(new TaskActivateAction()).run(task4);
 		taskView.addTaskToHistory(task4); //Simulate clicking on it rather than navigating next or previous
 		assertTrue(task4.isActive());
 		
@@ -143,13 +143,13 @@ public class TaskHistoryTest extends TestCase {
 		
 		//Simulate activating the tasks by clicking rather than 
 		//navigating previous/next
-		(new TaskActivateAction(task1)).run();
+		(new TaskActivateAction()).run(task1);
 		taskView.addTaskToHistory(task1);
-		(new TaskActivateAction(task2)).run();
+		(new TaskActivateAction()).run(task2);
 		taskView.addTaskToHistory(task2);
-		(new TaskActivateAction(task3)).run();
+		(new TaskActivateAction()).run(task3);
 		taskView.addTaskToHistory(task3);
-		(new TaskActivateAction(task4)).run();
+		(new TaskActivateAction()).run(task4);
 		taskView.addTaskToHistory(task4);
 		
 		assertTrue(task4.isActive());
@@ -194,8 +194,8 @@ public class TaskHistoryTest extends TestCase {
 		assertTrue(prevHistoryList.get(prevHistoryList.size() - 3) == task1);
 		
 		//Check that a deactivated task appears first on the history list
-		(new TaskActivateAction(task5)).run();
-		(new TaskDeactivateAction(task5, taskView)).run();
+		(new TaskActivateAction()).run(task5);
+		(new TaskDeactivateAction()).run(task5);
 		taskView.addTaskToHistory(task5);
 		prevHistoryList = taskHistory.getPreviousTasks();
 		assertTrue(prevHistoryList.get(prevHistoryList.size() - 1) == task5);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
index 102c965eb..76105ebd2 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
@@ -32,12 +32,33 @@ import org.eclipse.mylar.tasklist.internal.TaskList;
  */
 public class TaskListManagerTest extends TestCase {
 
+    public void testPlans() {
+        File file = new File("foo" + MylarTasklistPlugin.FILE_EXTENSION);
+        file.deleteOnExit();
+        TaskListManager manager = new TaskListManager(file);
+        
+        Task task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1", true);
+        task1.addPlan("default");
+        manager.addRootTask(task1);
+
+        manager.saveTaskList();
+        assertNotNull(manager.getTaskList());
+        TaskList list = new TaskList();
+        manager.setTaskList(list);
+        manager.readTaskList();
+        assertNotNull(manager.getTaskList());
+
+    	List<ITask> readList = manager.getTaskList().getRootTasks();
+    	ITask task = readList.get(0);
+    	assertEquals(1, task.getPlans().size());
+    	assertTrue(task.getPlans().get(0).equals("default"));
+    }
+	
     public void testCreationAndExternalization() {
         File file = new File("foo" + MylarTasklistPlugin.FILE_EXTENSION);
         file.deleteOnExit();
         TaskListManager manager = new TaskListManager(file);
         
-//        TaskList tlist = manager.getTaskList();
         Task task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1", true);
         manager.addRootTask(task1);
         Task sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub 1", true);