NEW - bug 369697: fix test failures on Java 1.7

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

Change-Id: I68b51f8bc733acf73a1a8b85f555c4fbac69a29d

3 files changed, 16 insertions, 4 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 76564626d..7f36e0835 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
@@ -39,11 +39,12 @@ import org.eclipse.mylyn.tasks.tests.ui.editor.TaskUrlHyperlinkDetectorTest;
 /**
  * @author Mik Kersten
  * @author Shawn Minto
+ * @author Steffen Pingel
  */
 public class AllTasksTests {
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.tasks.tests");
+		TestSuite suite = new TestSuite(AllTasksTests.class.getName());
 		suite.addTestSuite(TasksUiUtilTest.class);
 		suite.addTestSuite(TaskListUiTest.class);
 		suite.addTestSuite(TaskRepositoryTest.class);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java
index 33b059131..f29dad897 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java
@@ -17,6 +17,7 @@ import org.eclipse.mylyn.commons.ui.ClipboardCopier;
 import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.internal.tasks.ui.actions.CopyTaskDetailsAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.CopyTaskDetailsAction.Mode;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector;
 import org.eclipse.mylyn.tasks.tests.connector.MockTask;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
@@ -75,9 +76,17 @@ public class CopyDetailsActionTest extends TestCase {
 				return "http://321.com";
 			}
 		};
-		((TaskRepositoryManager) TasksUi.getRepositoryManager()).addRepositoryConnector(connector);
-		assertEquals("321: s321" + ClipboardCopier.LINE_SEPARATOR + "http://321.com",
-				CopyTaskDetailsAction.getTextForTask(task, Mode.SUMMARY_URL));
+		AbstractRepositoryConnector oldConnector = TasksUi.getRepositoryManager().getRepositoryConnector(
+				MockRepositoryConnector.CONNECTOR_KIND);
+		try {
+			((TaskRepositoryManager) TasksUi.getRepositoryManager()).addRepositoryConnector(connector);
+			assertEquals("321: s321" + ClipboardCopier.LINE_SEPARATOR + "http://321.com",
+					CopyTaskDetailsAction.getTextForTask(task, Mode.SUMMARY_URL));
+		} finally {
+			if (oldConnector != null) {
+				((TaskRepositoryManager) TasksUi.getRepositoryManager()).addRepositoryConnector(oldConnector);
+			}
+		}
 	}
 
 }
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
index 0336b2a98..0e92a640b 100644
--- 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
@@ -30,6 +30,7 @@ import org.eclipse.mylyn.internal.tasks.core.TaskList;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.workingsets.TaskWorkingSetUpdater;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryQuery;
+import org.eclipse.mylyn.tests.util.TestFixture;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.IWorkingSetManager;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -52,6 +53,7 @@ public class TaskWorkingSetTest extends TestCase {
 	protected void setUp() throws Exception {
 		workingSetManager = Workbench.getInstance().getWorkingSetManager();
 		root = ResourcesPlugin.getWorkspace().getRoot();
+		TestFixture.resetTaskList();
 	}
 
 	@Override