NEW - bug 162094: [upstream] query by milestone returns no result when

milestone name includes ampersand 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=162094

3 files changed, 27 insertions, 5 deletions

diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java
index 867266e45..a9ba64892 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java
@@ -122,7 +122,7 @@ public class TracSearch {
 			sb.append("="); //$NON-NLS-1$
 			List<String> values = filter.getValues();
 			for (Iterator<String> it = values.iterator(); it.hasNext();) {
-				sb.append(it.next());
+				sb.append(escapeValue(it.next()));
 				if (it.hasNext()) {
 					sb.append("|"); //$NON-NLS-1$
 				}
@@ -131,6 +131,12 @@ public class TracSearch {
 		return sb.toString();
 	}
 
+	private String escapeValue(String text) {
+		text = text.replaceAll("&", "\\\\&"); //$NON-NLS-1$ //$NON-NLS-2$
+		text = text.replaceAll("\\|", "\\\\|"); //$NON-NLS-1$ //$NON-NLS-2$
+		return text;
+	}
+
 	/**
 	 * Returns a URL encoded string that can be passed as an argument to the Trac query script.
 	 * 
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracClientTest.java
index b87ef64e5..fb11a4c3f 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracClientTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracClientTest.java
@@ -168,10 +168,6 @@ public class TracClientTest extends TestCase {
 	}
 
 	public void testSearchMilestoneAmpersand() throws Exception {
-		// XXX re-enable for XML-RPC when bug 162094 is resolved
-		if (client.getAccessMode() == Version.XML_RPC) {
-			return;
-		}
 		TracSearch search = new TracSearch();
 		search.addFilter("milestone", "mile&stone");
 		search.setOrderBy("id");
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracSearchTest.java
index ced5053a0..7371f3d7c 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracSearchTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracSearchTest.java
@@ -133,4 +133,24 @@ public class TracSearchTest extends TestCase {
 		assertEquals("&order=summary" + QUERY1, search1.toQuery());
 	}
 
+	public void testToQueryAmpersand() {
+		TracSearch search = new TracSearch();
+		search.addFilter("milestone", "mile&stone&");
+		assertEquals("&milestone=mile\\&stone\\&", search.toQuery());
+	}
+
+	public void testToQueryPipe() {
+		TracSearch search = new TracSearch();
+		search.addFilter("field", "|pipes||");
+		assertEquals("&field=\\|pipes\\|\\|", search.toQuery());
+	}
+
+	public void testToQueryPipeAmpersand() {
+		TracSearch search = new TracSearch();
+		search.addFilter("pipe", "|");
+		search.addFilter("amp", "&");
+		search.addFilter("amppipe", "|&");
+		assertEquals("&pipe=\\|&amp=\\&&amppipe=\\|\\&", search.toQuery());
+	}
+
 }