NEW - bug 259919: fix failing tests

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

1 files changed, 31 insertions, 47 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
index b4eb5c748..e1e88a0bc 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
@@ -14,15 +14,16 @@ package org.eclipse.mylyn.tasks.tests;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import org.eclipse.mylyn.commons.tests.support.CommonsTestUtil;
 import org.eclipse.mylyn.context.core.ContextCore;
 import org.eclipse.mylyn.context.tests.AbstractContextTest;
 import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.context.core.InteractionContext;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.ui.TaskListBackupManager;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.Messages;
@@ -39,13 +40,13 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class TaskDataExportTest extends AbstractContextTest {
 
-	private TaskDataExportWizard wizard = null;
+	private TaskDataExportWizard wizard;
 
-	private TaskDataExportWizardPage wizardPage = null;
+	private TaskDataExportWizardPage wizardPage;
 
-	private File destinationDir = null;
+	private File destinationDir;
 
-	private AbstractTask task1 = null;
+	private AbstractTask task1;
 
 	private InteractionContext mockContext;
 
@@ -53,9 +54,6 @@ public class TaskDataExportTest extends AbstractContextTest {
 	protected void setUp() throws Exception {
 		super.setUp();
 
-		removeFiles(new File(TasksUiPlugin.getDefault().getDataDirectory()));
-//		ContextCore.getContextStore().init();
-
 		// Create the export wizard
 		wizard = new TaskDataExportWizard();
 		wizard.addPages();
@@ -64,22 +62,19 @@ public class TaskDataExportTest extends AbstractContextTest {
 		assertNotNull(wizardPage);
 
 		// Create test export destination directory
-		destinationDir = new File(TasksUiPlugin.getDefault().getDataDirectory() + File.separator + "TestDir");
-		if (destinationDir.exists()) {
-			removeFiles(destinationDir);
-		} else {
-			destinationDir.mkdir();
-		}
+		destinationDir = new File(TasksUiPlugin.getDefault().getDataDirectory(), "TestDir");
+		CommonsTestUtil.deleteFolder(destinationDir);
+		destinationDir.mkdir();
 		assertTrue(destinationDir.exists());
 
 		// Create a task and context with an interaction event to be saved
 		task1 = TasksUiInternal.createNewLocalTask("Export Test Task");
 		TasksUiPlugin.getTaskList().addTask(task1);
+
+		// Save the context file and check that it exists
 		mockContext = (InteractionContext) ContextCorePlugin.getContextStore().loadContext(task1.getHandleIdentifier());
 		InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.EDIT, "structureKind", "handle", "originId");
 		mockContext.parseEvent(event);
-
-		// Save the context file and check that it exists
 		ContextCorePlugin.getContextStore().saveContext(mockContext);
 		File taskFile = ContextCorePlugin.getContextStore().getFileForContext(task1.getHandleIdentifier());
 		assertTrue(ContextCore.getContextManager().hasContext(task1.getHandleIdentifier()));
@@ -92,47 +87,36 @@ public class TaskDataExportTest extends AbstractContextTest {
 	@Override
 	protected void tearDown() throws Exception {
 		ContextCore.getContextManager().deactivateContext(mockContext.getHandleIdentifier());
-		removeFiles(destinationDir);
-		destinationDir.delete();
-		assertFalse(destinationDir.exists());
+		CommonsTestUtil.deleteFolder(destinationDir);
 		super.tearDown();
 	}
 
 	/**
-	 * Tests the wizard when it has been asked to export all task data to a zip file
+	 * Tests the wizard when it has been asked to export all task data to a zip file.
 	 */
 	public void testExportAllToZip() throws Exception {
-
-		// Set parameters in the wizard to simulate a user setting them and
-		// clicking "Finish"
+		// set parameters in the wizard to simulate a user setting them and clicking "Finish"
 		wizardPage.setParameters(true, true, true, true, true, destinationDir.getPath());
 		wizard.performFinish();
 
-		// Check that the task list file was exported
-		File destZipFile = new File(destinationDir + File.separator + TaskListBackupManager.getBackupFileName());
-		assertTrue(destZipFile.exists());
-		ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(destZipFile));
-		ArrayList<String> entries = new ArrayList<String>();
-
-		ZipEntry entry = zipInputStream.getNextEntry();
-		while (entry != null) {
-			entries.add(entry.getName());
-			entry = zipInputStream.getNextEntry();
-		}
-		zipInputStream.close();
-		assertEquals(3, entries.size());
-		assertTrue(entries.contains("tasklist.xml.zip"));
-		assertTrue(entries.contains("contexts/local-1.xml.zip"));
-	}
-
-	private void removeFiles(File root) {
-		if (root.isDirectory()) {
-			for (File file : root.listFiles()) {
-				if (file.isDirectory()) {
-					removeFiles(file);
-				}
-				file.delete();
+		// check that the task list file was exported
+		File[] files = destinationDir.listFiles();
+		assertEquals(1, files.length);
+		ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(files[0]));
+		try {
+			ArrayList<String> entries = new ArrayList<String>();
+			ZipEntry entry = zipInputStream.getNextEntry();
+			while (entry != null) {
+				entries.add(entry.getName());
+				entry = zipInputStream.getNextEntry();
 			}
+			assertEquals(3, entries.size());
+			Collections.sort(entries);
+			assertEquals("contexts/local-1.xml.zip", entries.get(0));
+			assertEquals("repositories.xml.zip", entries.get(1));
+			assertEquals("tasks.xml.zip", entries.get(2));
+		} finally {
+			zipInputStream.close();
 		}
 	}
 }