NEW - bug 191575: [api] optimize query synchronization

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

3 files changed, 12 insertions, 9 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 2c4f2a587..9f1270b28 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
@@ -386,9 +386,11 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 		TasksUiPlugin.getRepositoryManager().setSyncTime(repository, task5.getLastSyncDateStamp(),
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 
-		Set<AbstractTask> changedTasks = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());
+		boolean changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
+		assertTrue(changed);
 		// Always last known changed returned
-		assertEquals(1, changedTasks.size());
+		assertFalse(task4.isStale());
+		assertTrue(task5.isStale());
 
 		String priority4 = null;
 		if (task4.getPriority().equals("P1")) {
@@ -414,14 +416,15 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 		submit(task4, taskData4);
 		submit(task5, taskData5);
 
-		changedTasks = connector.getChangedSinceLastSync(repository, tasks, new NullProgressMonitor());
+		changed = connector.markStaleTasks(repository, tasks, new NullProgressMonitor());
 
-		assertEquals("Changed reports expected ", 2, changedTasks.size());
-		assertTrue(tasks.containsAll(changedTasks));
+		assertTrue(task4.isStale());
+		assertTrue(task5.isStale());
 
-		TasksUiPlugin.getSynchronizationManager().synchronize(connector, changedTasks, true, null);
+		TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasks, true, null);
 
-		for (AbstractTask task : changedTasks) {
+
+		for (AbstractTask task : tasks) {
 			if (task.getTaskId() == "4") {
 				assertEquals(priority4, task4.getPriority());
 			}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
index 493557319..9cc663dab 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
@@ -118,7 +118,7 @@ public class BugzillaSearchEngineTest extends TestCase {
 		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 		QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository));
 
-		connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector, false);
+		connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector);
 
 		// results.addAll(connector.performQuery(repositoryQuery, new
 		// NullProgressMonitor(), new MultiStatus(TasksUiPlugin.PLUGIN_ID,
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
index 1c136ce4c..f20bd5c05 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
@@ -136,7 +136,7 @@ public class BugzillaQueryTest extends TestCase {
 		BugzillaRepositoryConnector connector = new BugzillaRepositoryConnector();
 		connector.init(taskList);
 		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "summary");
-		connector.performQuery(query, repository, new NullProgressMonitor(), collector, false);
+		connector.performQuery(query, repository, new NullProgressMonitor(), collector);
 		assertEquals(2, collector.getTaskHits().size());
 		for (AbstractTask hit : collector.getTaskHits()) {
 			assertTrue(hit.getSummary().contains("search-match-test"));