Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-06-11 04:57:48 +0000
committerGreg Wilkins2013-06-11 04:57:48 +0000
commit9ec1378b73d638ce379f67528aced3e65b92ef3e (patch)
tree3672562c9037a2562c8548b3643f5d472163c26f /jetty-servlet
parent06d3fbe5aac4ef19faa0eb483960a0505cae6977 (diff)
downloadorg.eclipse.jetty.project-9ec1378b73d638ce379f67528aced3e65b92ef3e.tar.gz
org.eclipse.jetty.project-9ec1378b73d638ce379f67528aced3e65b92ef3e.tar.xz
org.eclipse.jetty.project-9ec1378b73d638ce379f67528aced3e65b92ef3e.zip
fixed merge
Diffstat (limited to 'jetty-servlet')
-rw-r--r--jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
index 0399280eca..2b27158ec1 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
@@ -586,10 +586,14 @@ public class DispatcherTest
assertEquals(null, request.getPathInfo());
assertEquals(null, request.getPathTranslated());
- UrlEncoded query = new UrlEncoded(request.getQueryString());
+ UrlEncoded query = new UrlEncoded();
+ query.decode(request.getQueryString());
assertThat(query.getString("do"), is("end"));
+
// Russian for "selected=Temperature"
- String russian = new UrlEncoded(query.getString("else")).encode();
+ UrlEncoded q2=new UrlEncoded();
+ q2.decode(query.getString("else"));
+ String russian = q2.encode();
assertThat(russian, is("%D0%B2%D1%8B%D0%B1%D1%80%D0%B0%D0%BD%D0%BE=%D0%A2%D0%B5%D0%BC%D0%BF%D0%B5%D1%80%D0%B0%D1%82%D1%83%D1%80%D0%B0"));
assertThat(query.getString("test"), is("1"));
assertThat(query.containsKey("foreign"), is(true));

Back to the top