REOPENED - bug 176634: Speed up Trac test cases

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

4 files changed, 56 insertions, 23 deletions

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java
index 538620b60..604fcba7c 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java
@@ -161,7 +161,8 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		TracSearch search = new TracSearch();
 		List<TracTicket> result = new ArrayList<TracTicket>();
 		repository.search(search, result);
-		assertEquals(tickets.size(), result.size());
+		//assertEquals(tickets.size(), result.size());
+		assertTrue(result.size() >= tickets.size());
 	}
 
 	public void testSearchEmpty010() throws Exception {
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
index e1a6d8d6b..0113f7130 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
@@ -37,6 +37,7 @@ import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.trac.tests.support.TestFixture;
+import org.eclipse.mylyn.trac.tests.support.TracTestUtil;
 import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData;
 
 /**
@@ -54,6 +55,8 @@ public class TracTaskDataHandlerTest extends TestCase {
 
 	private AbstractTaskDataHandler taskDataHandler;
 
+	private ITracClient client;
+
 	public TracTaskDataHandlerTest() {
 	}
 
@@ -68,7 +71,7 @@ public class TracTaskDataHandlerTest extends TestCase {
 
 		connector = (TracRepositoryConnector) manager.getRepositoryConnector(TracCorePlugin.REPOSITORY_KIND);
 		TasksUiPlugin.getSynchronizationManager().setForceSyncExec(true);
-				
+
 		taskDataHandler = connector.getTaskDataHandler();
 	}
 
@@ -82,6 +85,8 @@ public class TracTaskDataHandlerTest extends TestCase {
 		repository.setVersion(version.name());
 
 		manager.addRepository(repository, TasksUiPlugin.getDefault().getRepositoriesFilePath());
+
+		client = connector.getClientManager().getRepository(repository);
 	}
 
 	public void testGetChangedSinceLastSyncWeb096() throws Exception {
@@ -116,7 +121,8 @@ public class TracTaskDataHandlerTest extends TestCase {
 	}
 
 	private void markStaleTasks() throws Exception {
-		TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "",
+		TracTicket ticket = TracTestUtil.createTicket(client, "markStaleTasks");
+		TracTask task = (TracTask) connector.createTaskFromExistingId(repository, ticket.getId() + "",
 				new NullProgressMonitor());
 		TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
 		RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(),
@@ -149,13 +155,7 @@ public class TracTaskDataHandlerTest extends TestCase {
 
 		// change ticket making sure it gets a new change time
 		Thread.sleep(1000);
-		ITracClient client = connector.getClientManager().getRepository(repository);
-		TracTicket ticket = client.getTicket(data.offlineHandlerTicketId);
-		if (ticket.getValue(Key.DESCRIPTION).equals(lastModified + "")) {
-			ticket.putBuiltinValue(Key.DESCRIPTION, lastModified + "x");
-		} else {
-			ticket.putBuiltinValue(Key.DESCRIPTION, lastModified + "");
-		}
+		ticket.putBuiltinValue(Key.DESCRIPTION, lastModified + "");
 		client.updateTicket(ticket, "comment");
 
 		task.setStale(false);
@@ -218,36 +218,40 @@ public class TracTaskDataHandlerTest extends TestCase {
 		init(TracTestConstants.TEST_TRAC_010_URL, Version.XML_RPC);
 		attachmentChangesLastModifiedDate();
 	}
-	
+
 	public void testAttachmentChangesLastModifiedDate011() throws Exception {
 		init(TracTestConstants.TEST_TRAC_011_URL, Version.XML_RPC);
 		attachmentChangesLastModifiedDate();
 	}
 
 	private void attachmentChangesLastModifiedDate() throws Exception {
-		RepositoryTaskData taskData = taskDataHandler.getTaskData(repository, data.attachmentTicketId + "", new NullProgressMonitor());
+		RepositoryTaskData taskData = taskDataHandler.getTaskData(repository, data.attachmentTicketId + "",
+				new NullProgressMonitor());
 		TracTask task = new TracTask(repository.getUrl(), data.attachmentTicketId + "", "");
 		connector.updateTaskFromTaskData(repository, task, taskData);
-		Date lastModified = taskDataHandler.getAttributeFactory(taskData).getDateForAttributeType(RepositoryTaskAttribute.DATE_MODIFIED, taskData.getLastModified());
-		
+		Date lastModified = taskDataHandler.getAttributeFactory(taskData).getDateForAttributeType(
+				RepositoryTaskAttribute.DATE_MODIFIED, taskData.getLastModified());
+
 		AbstractAttachmentHandler attachmentHandler = connector.getAttachmentHandler();
 		ITaskAttachment attachment = new MockAttachment("abc".getBytes());
 		attachmentHandler.uploadAttachment(repository, task, attachment, null, new NullProgressMonitor());
-		
+
 		taskData = taskDataHandler.getTaskData(repository, data.attachmentTicketId + "", new NullProgressMonitor());
-		Date newLastModified = taskDataHandler.getAttributeFactory(taskData).getDateForAttributeType(RepositoryTaskAttribute.DATE_MODIFIED, taskData.getLastModified());
-		assertTrue("Expected " + newLastModified + " to be more recent than " + lastModified, newLastModified.after(lastModified));
+		Date newLastModified = taskDataHandler.getAttributeFactory(taskData).getDateForAttributeType(
+				RepositoryTaskAttribute.DATE_MODIFIED, taskData.getLastModified());
+		assertTrue("Expected " + newLastModified + " to be more recent than " + lastModified,
+				newLastModified.after(lastModified));
 	}
 
 	public void testPostTaskDataInvalidCredentials010() throws Exception {
 		init(TracTestConstants.TEST_TRAC_010_URL, Version.XML_RPC);
 		postTaskDataInvalidCredentials();
-	}		
+	}
 
 	public void testPostTaskDataInvalidCredentials011() throws Exception {
 		init(TracTestConstants.TEST_TRAC_011_URL, Version.XML_RPC);
 		postTaskDataInvalidCredentials();
-	}		
+	}
 
 	private void postTaskDataInvalidCredentials() throws Exception {
 		TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "",
@@ -255,7 +259,7 @@ public class TracTaskDataHandlerTest extends TestCase {
 		TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
 		RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(),
 				task.getTaskId());
-		
+
 		taskData.setNewComment("new comment");
 		repository.setAuthenticationCredentials("foo", "bar");
 		try {
@@ -265,5 +269,5 @@ public class TracTaskDataHandlerTest extends TestCase {
 		}
 		assertEquals("new comment", taskData.getNewComment());
 	}
-	
+
 }
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java
index 8b7a33f69..ed6eeef16 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestCleanupUtil.java
@@ -21,11 +21,11 @@ import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData;
  * 
  * @author Steffen Pingel
  */
-public class TestCleanupUtil extends AbstractTracClientTest {
+public class TracTestCleanupUtil extends AbstractTracClientTest {
 
 	private TestData data;
 
-	public TestCleanupUtil() {
+	public TracTestCleanupUtil() {
 		super(Version.XML_RPC, PrivilegeLevel.ADMIN);
 	}
 
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java
new file mode 100644
index 000000000..e647f4f27
--- /dev/null
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.mylyn.trac.tests.support;
+
+import org.eclipse.mylyn.internal.trac.core.ITracClient;
+import org.eclipse.mylyn.internal.trac.core.model.TracTicket;
+import org.eclipse.mylyn.internal.trac.core.model.TracTicket.Key;
+
+/**
+ * @author Steffen Pingel
+ */
+public class TracTestUtil {
+
+	public static TracTicket createTicket(ITracClient client, String summary) throws Exception {
+		TracTicket ticket = new TracTicket();
+		ticket.putBuiltinValue(Key.SUMMARY, summary);
+		ticket.putBuiltinValue(Key.DESCRIPTION, "");
+		int id = client.createTicket(ticket);
+		return client.getTicket(id);
+	}
+	
+}