NEW - bug 253932: [upstream] submitting changes also sends unchanged fields possibly resetting them to old values

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

2 files changed, 9 insertions, 0 deletions

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 05eb282ff..0303b66c7 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
@@ -412,6 +412,12 @@ public class TracTaskDataHandlerXmlRpcTest extends TestCase {
 
 	public void testPostTaskDataMidAirCollision() throws Exception {
 		TracTicket ticket = TracTestUtil.createTicket(client, "midAirCollision");
+		if (ticket.getValue(Key.TOKEN) == null) {
+			// repository does not have mid-air collision support
+			System.err.println("Skipping TracTaskDataHandler.testPostTaskDataMidAirCollision() due to lack of mid-air collision support on "
+					+ repository.getRepositoryUrl());
+			return;
+		}
 		TaskData taskData = taskDataHandler.getTaskData(repository, ticket.getId() + "", new NullProgressMonitor());
 		TaskAttribute attribute = taskData.getRoot().getMappedAttribute(TaskAttribute.PRIORITY);
 		attribute.setValue("blocker");
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
index b42dcd4e0..7262d06da 100644
--- 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
@@ -105,6 +105,9 @@ public class TracTestUtil {
 						expected = expectedString.substring(0, i + 1) + "\u2026";
 					}
 				}
+			} else if (key.startsWith("_")) {
+				// ignore internal values
+				continue;
 			}
 			Assert.assertEquals("Values for key '" + key + "' did not match", expected, actual);
 		}