290465: fix Bugzilla test suite

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

2 files changed, 10 insertions, 11 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
index 67cea36ac..f4d5a39d1 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
@@ -43,7 +43,6 @@ public class AllBugzillaTests {
 					fixture.add(BugzillaRepositoryConnectorTest.class);
 					fixture.add(BugzillaAttachmentHandlerTest.class);
 				}
-				// Passing
 				fixture.add(BugzillaTaskDataHandlerTest.class);
 				fixture.add(RepositoryReportFactoryTest.class);
 				fixture.add(BugzillaTaskHyperlinkDetectorTest.class);
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 78c4fbb59..948a2e429 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
@@ -554,27 +554,27 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 	public void testMidAirCollision() throws Exception {
 		TaskData data = BugzillaFixture.current().createTask(PrivilegeLevel.USER, null, null);
 		assertNotNull(data);
-		// Get the task
-		ITask task = generateLocalTaskAndDownload(data.getTaskId());
-
-		ITaskDataWorkingCopy workingCopy = TasksUiPlugin.getTaskDataManager().getWorkingCopy(task);
-		TaskData taskData = workingCopy.getLocalData();
-		assertNotNull(taskData);
+//		// Get the task
+//		ITask task = generateLocalTaskAndDownload(data.getTaskId());
+//
+//		ITaskDataWorkingCopy workingCopy = TasksUiPlugin.getTaskDataManager().getWorkingCopy(task);
+//		TaskData taskData = workingCopy.getLocalData();
+//		assertNotNull(taskData);
 
 		String newCommentText = "BugzillaRepositoryClientTest.testMidAirCollision(): test " + (new Date()).toString();
-		TaskAttribute attrNewComment = taskData.getRoot().getMappedAttribute(TaskAttribute.COMMENT_NEW);
+		TaskAttribute attrNewComment = data.getRoot().getMappedAttribute(TaskAttribute.COMMENT_NEW);
 		attrNewComment.setValue(newCommentText);
 		Set<TaskAttribute> changed = new HashSet<TaskAttribute>();
 		changed.add(attrNewComment);
-		TaskAttribute attrDeltaTs = taskData.getRoot().getMappedAttribute(TaskAttribute.DATE_MODIFICATION);
+		TaskAttribute attrDeltaTs = data.getRoot().getMappedAttribute(TaskAttribute.DATE_MODIFICATION);
 		attrDeltaTs.setValue("2007-01-01 00:00:00");
 		changed.add(attrDeltaTs);
 
-		workingCopy.save(changed, new NullProgressMonitor());
+		//workingCopy.save(changed, new NullProgressMonitor());
 
 		try {
 			// Submit changes
-			BugzillaFixture.current().submitTask(workingCopy.getLocalData(), client);
+			BugzillaFixture.current().submitTask(data, client);
 			fail("Mid-air collision expected");
 		} catch (CoreException e) {
 			assertTrue(e.getStatus().getMessage().indexOf("Mid-air collision occurred while submitting") != -1);