NEW - bug 196283: Improve task list save mechanism ideally eliminating deferred write

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

2 files changed, 10 insertions, 16 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java
index 5e715e23f..420fe7d31 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java
@@ -24,7 +24,6 @@ import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil;
 import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
 import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore;
 
 /**
  * Tests unused code that was live up to Mylyn 1.0.1, {@link TasksUiPlugin}
@@ -87,7 +86,7 @@ public class TaskList06DataMigrationTest extends TestCase {
 		oldContextFile2.createNewFile();
 		File oldContextFile3 = new File(sourceDirFile, contextFileName3);
 		oldContextFile3.createNewFile();
-		File contextFolder = new File(sourceDirFile, WorkspaceAwareContextStore.CONTEXTS_DIRECTORY);
+		File contextFolder = new File(sourceDirFile, ITasksCoreConstants.CONTEXTS_DIRECTORY);
 		assertTrue(!contextFolder.exists());
 		assertTrue(migrator.migrateTaskContextData(new NullProgressMonitor()));
 		assertFalse(oldContextFile1.exists());
@@ -103,7 +102,7 @@ public class TaskList06DataMigrationTest extends TestCase {
 		File oldActivityFile = new File(sourceDirFile, IInteractionContextManager.OLD_CONTEXT_HISTORY_FILE_NAME
 				+ IInteractionContextManager.CONTEXT_FILE_EXTENSION_OLD);
 		oldActivityFile.createNewFile();
-		File contextFolder = new File(sourceDirFile, WorkspaceAwareContextStore.CONTEXTS_DIRECTORY);
+		File contextFolder = new File(sourceDirFile, ITasksCoreConstants.CONTEXTS_DIRECTORY);
 		assertTrue(!contextFolder.exists());
 		assertTrue(migrator.migrateActivityData(new NullProgressMonitor()));
 		assertFalse(oldActivityFile.exists());
@@ -234,7 +233,7 @@ class TaskListDataMigration implements IRunnableWithProgress {
 		try {
 			monitor.beginTask("Task Context Migration", contextFiles.size());
 
-			File contextsFolder = new File(dataDirectory, WorkspaceAwareContextStore.CONTEXTS_DIRECTORY);
+			File contextsFolder = new File(dataDirectory, ITasksCoreConstants.CONTEXTS_DIRECTORY);
 			if (!contextsFolder.exists()) {
 				if (!contextsFolder.mkdir()) {
 					throw new Exception(
@@ -271,7 +270,7 @@ class TaskListDataMigration implements IRunnableWithProgress {
 			return false;
 		}
 
-		File contextsFolder = new File(dataDirectory, WorkspaceAwareContextStore.CONTEXTS_DIRECTORY);
+		File contextsFolder = new File(dataDirectory, ITasksCoreConstants.CONTEXTS_DIRECTORY);
 		if (!contextsFolder.exists()) {
 			if (!contextsFolder.mkdir()) {
 				throw new Exception("Could not create contexts folder. Check read/write permission on data directory.");
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
index 14d74033d..0c77891c3 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
@@ -44,7 +44,7 @@ public class TaskListBackupManagerTest extends TestCase {
 	}
 
 	public void testAutoBackupDisabled() throws InterruptedException {
-		TaskListBackupManager backupManager = TasksUiPlugin.getDefault().getBackupManager();
+		TaskListBackupManager backupManager = TasksUiPlugin.getBackupManager();
 		TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_SCHEDULE, 1);
 		TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_LAST, 0f);
 		assertEquals(0, TasksUiPlugin.getDefault().getPreferenceStore().getLong(TasksUiPreferenceConstants.BACKUP_LAST));
@@ -54,14 +54,13 @@ public class TaskListBackupManagerTest extends TestCase {
 	}
 
 	public void testAutoBackupEnabled() throws InterruptedException, InvocationTargetException, IOException {
-		TaskListBackupManager backupManager = TasksUiPlugin.getDefault().getBackupManager();
+		TaskListBackupManager backupManager = TasksUiPlugin.getBackupManager();
 		String backupFolder = TasksUiPlugin.getDefault().getBackupFolderPath();
 		File backupFileFolder = new File(backupFolder);
 		deleteBackupFolder(backupFileFolder);
-		TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_SCHEDULE, 1);
-		TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_LAST, 0f);
 		backupManager.backupNow(true);
-		assertFalse(TasksUiPlugin.getDefault().getPreferenceStore().getLong(TasksUiPreferenceConstants.BACKUP_LAST) == 0);
+		Thread.sleep(3000);
+		backupManager.backupNow(true);
 		assertTrue(backupFileFolder.exists());
 		assertTrue(backupFileFolder.isDirectory());
 		assertTrue(backupFileFolder.listFiles(new FilenameFilter() {
@@ -72,10 +71,9 @@ public class TaskListBackupManagerTest extends TestCase {
 				return false;
 			}
 
-		}).length == 1);
+		}).length == 2);
 
 		// Test removal of old backups
-		TasksUiPlugin.getDefault().getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_MAXFILES, 0);
 		TasksUiPlugin.getBackupManager().removeOldBackups();
 		assertTrue(backupFileFolder.listFiles(new FilenameFilter() {
 			public boolean accept(File dir, String name) {
@@ -85,10 +83,7 @@ public class TaskListBackupManagerTest extends TestCase {
 				return false;
 			}
 
-		}).length == 0);
-
-		// TODO: Test that OLDEST backups are deleted first.
-
+		}).length == 1);
 	}
 
 	private void deleteBackupFolder(File backupFileFolder) {