Progress on: 148691: bugzilla tests run very slowly

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

1 files changed, 67 insertions, 87 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index d20fa1fb2..42ae80d76 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -106,7 +106,7 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 		repository.setTimeZoneId("Canada/Eastern");
 		assertNotNull(manager);
 		manager.addRepository(repository);
-		
+
 		taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 
 		AbstractRepositoryConnector abstractRepositoryClient = manager.getRepositoryConnector(DEFAULT_KIND);
@@ -225,61 +225,18 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 		assertEquals(task1.getDescription(), task2.getDescription());
 	}
 
-	class MockBugzillaReportSubmitForm extends BugzillaReportSubmitForm {
-
-		public MockBugzillaReportSubmitForm(String encoding_utf_8) {
-			super(encoding_utf_8);
-		}
-
-		@Override
-		public String submitReportToRepository() throws BugzillaException, LoginException,
-				PossibleBugzillaFailureException {
-			return "test-submit";
-		}
-
-	}
-
-	protected void updateBug(RepositoryTaskData bug) {
-
-		// go through all of the attributes and update the main values to the
-		// new ones
-		// for (Iterator<AbstractRepositoryTaskAttribute> it =
-		// bug.getAttributes().iterator(); it.hasNext();) {
-		// AbstractRepositoryTaskAttribute attribute = it.next();
-		// if (attribute.getValue() != null &&
-		// attribute.getValue().compareTo(attribute.getValue()) != 0) {
-		// bug.setHasChanged(true);
-		// }
-		// attribute.setValue(attribute.getNewValue());
-		//
-		// }
-		// if (bug.getNewComment().compareTo(bug.getNewNewComment()) != 0) {
-		// bug.setHasChanged(true);
-		// }
-
-		// Update some other fields as well.
-		// bug.setNewComment(bug.getNewNewComment());
-
-	}
-
 	public void testAttachToExistingReport() throws Exception {
 		init222();
 		int bugId = 31;
-		String taskNumber = ""+bugId;
+		String taskNumber = "" + bugId;
 		BugzillaTask task = (BugzillaTask) client.createTaskFromExistingKey(repository, taskNumber);
 		assertNotNull(task);
-		// assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
 		assertTrue(task.isDownloaded());
-		// client.synchronize(task, true, null);
 		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState());
-
 		assertEquals(bugId, Integer.parseInt(task.getTaskData().getId()));
 		int numAttached = task.getTaskData().getAttachments().size();
 		String fileName = "test-attach-" + System.currentTimeMillis() + ".txt";
 
-		// A valid user name and password for the mylar bugzilla test server
-		// must
-		// be present. See 'setUp()'
 		assertNotNull(repository.getUserName());
 		assertNotNull(repository.getPassword());
 
@@ -324,24 +281,22 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 
 		init222();
 		BugzillaTask task4 = generateLocalTaskAndDownload("4");
+		assertNotNull(task4.getTaskData());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task4.getSyncState());
 		assertEquals(4, Integer.parseInt(task4.getTaskData().getId()));
 
 		BugzillaTask task5 = generateLocalTaskAndDownload("5");
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task5.getSyncState());
 		assertEquals(5, Integer.parseInt(task5.getTaskData().getId()));
 
 		Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
 		tasks.add(task4);
 		tasks.add(task5);
 
-		synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
+		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastModifiedDateStamp());
 
-		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, null);
-		client.synchronizeChanged(repository);
-		// synchronizeChanged uses the date stamp from the most recent task
-		// returned so
-		// this should always result in 1 task being returned (the most recently
-		// modified task).
-		Set<AbstractRepositoryTask> changedTasks = client.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks);
+		Set<AbstractRepositoryTask> changedTasks = client.getOfflineTaskHandler().getChangedSinceLastSync(repository,
+				tasks);
 		assertEquals(1, changedTasks.size());
 
 		String priority4 = null;
@@ -372,35 +327,43 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 			bugzillaReportSubmitForm.submitReportToRepository();
 		}
 
-		assertEquals("Changed reports expected ", 2, client.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks).size());
-
-		synchAndAssertState(tasks, RepositoryTaskSyncState.INCOMING);
-		synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
-
-		assertEquals(priority4, task4.getPriority());
-		assertEquals(priority5, task5.getPriority());
+		changedTasks = client.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks);
+		assertEquals("Changed reports expected ", 2, changedTasks.size());
+		assertTrue(tasks.containsAll(changedTasks));
+		for (AbstractRepositoryTask task : changedTasks) {
+			if (task.getTaskData().getId() == "4") {
+				assertEquals(priority4, task4.getPriority());
+			}
+			if (task.getTaskData().getId() == "5") {
+				assertEquals(priority5, task5.getPriority());
+			}
+		}
+		// synchAndAssertState(tasks, RepositoryTaskSyncState.INCOMING);
+		// synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
 	}
 
 	public void testIncomingWhenOfflineDeleted() throws Exception {
 
 		init222();
 		BugzillaTask task7 = generateLocalTaskAndDownload("7");
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task7.getSyncState());
 		assertEquals(7, Integer.parseInt(task7.getTaskData().getId()));
 
 		Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
 		tasks.add(task7);
-		synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
 
 		RepositoryTaskData recentTaskData = task7.getTaskData();
 		assertNotNull(recentTaskData);
 
-		assertFalse(TasksUiPlugin.getDefault().getOfflineReportsFile().find(
-				IBugzillaConstants.TEST_BUGZILLA_222_URL, "7") == -1);
+		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task7.getLastModifiedDateStamp());
+
+		assertFalse(TasksUiPlugin.getDefault().getOfflineReportsFile().find(IBugzillaConstants.TEST_BUGZILLA_222_URL,
+				"7") == -1);
 		ArrayList<RepositoryTaskData> taskDataList = new ArrayList<RepositoryTaskData>();
 		taskDataList.add(task7.getTaskData());
 		TasksUiPlugin.getDefault().getOfflineReportsFile().remove(taskDataList);
-		assertTrue(TasksUiPlugin.getDefault().getOfflineReportsFile().find(
-				IBugzillaConstants.TEST_BUGZILLA_222_URL, "7") == -1);
+		assertTrue(TasksUiPlugin.getDefault().getOfflineReportsFile().find(IBugzillaConstants.TEST_BUGZILLA_222_URL,
+				"7") == -1);
 
 		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task7.getSyncState());
 		// Task no longer stored offline
@@ -421,7 +384,6 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 		bugzillaReportSubmitForm = makeExistingBugPost(recentTaskData);
 		bugzillaReportSubmitForm.submitReportToRepository();
 		client.synchronizeChanged(repository);
-
 		assertEquals(RepositoryTaskSyncState.INCOMING, task7.getSyncState());
 	}
 
@@ -452,15 +414,17 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 		timeTracker(14, true);
 	}
 
-	public void testTimeTracker2201() throws Exception {
-		init2201();
-		timeTracker(22, true);
-	}
-
-	public void testTimeTracker220() throws Exception {
-		init220();
-		timeTracker(8, true);
-	}
+	// We'll skip these two for now and just test 222 and 218 since
+	// they are the most common. If problems arise we can re-enable.
+	// public void testTimeTracker2201() throws Exception {
+	// init2201();
+	// timeTracker(22, true);
+	// }
+	//
+	// public void testTimeTracker220() throws Exception {
+	// init220();
+	// timeTracker(8, true);
+	// }
 
 	public void testTimeTracker218() throws Exception {
 		init218();
@@ -474,20 +438,20 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 	protected void timeTracker(int taskid, boolean enableDeadline) throws Exception {
 		BugzillaTask bugtask = generateLocalTaskAndDownload("" + taskid);
 		assertEquals(taskid, Integer.parseInt(bugtask.getTaskData().getId()));
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, bugtask.getSyncState());
 
 		Set<AbstractRepositoryTask> tasks = new HashSet<AbstractRepositoryTask>();
 		tasks.add(bugtask);
 
-		synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
+		// synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
 
-		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, null);
-		client.synchronizeChanged(repository);
-		// if a task or two has changed the last sync date is updated to 1s
-		// after most recent change
-		// therefore the following call should generally result in 0 changed
-		// tasks returned.
-		Set<AbstractRepositoryTask> changedTasks = client.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks);
-		assertEquals(1, changedTasks.size());
+		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, bugtask.getLastModifiedDateStamp());
+		// client.synchronizeChanged(repository);
+
+		// Set<AbstractRepositoryTask> changedTasks =
+		// client.getOfflineTaskHandler().getChangedSinceLastSync(repository,
+		// tasks);
+		// assertEquals(1, changedTasks.size());
 
 		assertNotNull(repository.getUserName());
 		assertNotNull(repository.getPassword());
@@ -525,10 +489,12 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 			bugzillaReportSubmitForm.submitReportToRepository();
 		}
 
-		assertEquals("Changed reports expected ", 1, client.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks).size());
+		// assertEquals("Changed reports expected ", 1,
+		// client.getOfflineTaskHandler().getChangedSinceLastSync(repository,
+		// tasks).size());
 
 		synchAndAssertState(tasks, RepositoryTaskSyncState.INCOMING);
-		synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
+		// synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED);
 
 		bugtaskdata = bugtask.getTaskData();
 
@@ -553,7 +519,7 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 		s.close();
 
 		InetAddress anyHost = new Socket().getLocalAddress();
-		
+
 		s = factory.createSocket("mylar.eclipse.org", 80, anyHost, 0);
 		assertNotNull(s);
 		assertTrue(s.isConnected());
@@ -603,4 +569,18 @@ public class BugzillaRepositoryConnectorTest extends TestCase {
 	private boolean validateAttachmentAttributes(RepositoryAttachment att, boolean isPatch, boolean isObsolete) {
 		return (att.isPatch() == isPatch) && (att.isObsolete() == isObsolete);
 	}
+
+	class MockBugzillaReportSubmitForm extends BugzillaReportSubmitForm {
+
+		public MockBugzillaReportSubmitForm(String encoding_utf_8) {
+			super(encoding_utf_8);
+		}
+
+		@Override
+		public String submitReportToRepository() throws BugzillaException, LoginException,
+				PossibleBugzillaFailureException {
+			return "test-submit";
+		}
+
+	}
 }
\ No newline at end of file