REOPENED - bug 369697: fix test failures on Java 1.7

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

2 files changed, 9 insertions, 3 deletions

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracRepositoryConnectorTest.java
index 0a654b3b2..e2a068837 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracRepositoryConnectorTest.java
@@ -258,15 +258,19 @@ public class TracRepositoryConnectorTest extends TestCase {
 	}
 
 	public void testUpdateTaskFromTaskDataSummaryOnly() throws Exception {
-		TracTicket ticket = new TracTicket(456);
-		ticket.putBuiltinValue(Key.SUMMARY, "mysummary");
-
 		TracTaskDataHandler taskDataHandler = connector.getTaskDataHandler();
 		ITracClient client = connector.getClientManager().getTracClient(repository);
 		assertEquals(client.getAccessMode().name(), repository.getVersion());
+
+		// prepare task data
+		TracTicket ticket = new TracTicket(456);
+		ticket.putBuiltinValue(Key.SUMMARY, "mysummary");
 		TaskData taskData = taskDataHandler.createTaskDataFromTicket(client, repository, ticket, null);
+
 		ITask task = TasksUi.getRepositoryModel().createTask(repository, taskData.getTaskId());
+		task.setPriority("P1");
 
+		// create task from task data
 		connector.updateTaskFromTaskData(repository, task, taskData);
 		assertEquals(repository.getRepositoryUrl() + ITracClient.TICKET_URL + "456", task.getUrl());
 		assertEquals("456", task.getTaskKey());
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java
index e4c75bf1a..fa430809e 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java
@@ -93,6 +93,8 @@ public class TracTaskDataHandlerXmlRpcTest extends TestCase {
 
 	public void testMarkStaleTasks() throws Exception {
 		SynchronizationSession session;
+		// sleep for one second to ensure that the created ticket has a unique time stamp
+		Thread.sleep(1000);
 		TracTicket ticket = TracTestUtil.createTicket(client, "markStaleTasks");
 		ITask task = TracTestUtil.createTask(repository, ticket.getId() + "");
 		long lastModified = TracUtil.toTracTime(task.getModificationDate());