diff --git a/org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java index 5f795306a30..c6043c50c3e 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java @@ -169,6 +169,9 @@ public class RestTemplateIntegrationTests { result = template.getForObject(URI + "/uri/query={query}", String.class, "foo@bar"); assertEquals("Invalid request URI", "/uri/query=foo@bar", result); + + result = template.getForObject(URI + "/uri/query={query}", String.class, "T\u014dky\u014d"); + assertEquals("Invalid request URI", "/uri/query=T%C5%8Dky%C5%8D", result); } @Test diff --git a/org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTest.java b/org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTest.java index 06afa56d5a3..c3a2d680bb0 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTest.java +++ b/org.springframework.web/src/test/java/org/springframework/web/util/UriUtilsTest.java @@ -135,6 +135,8 @@ public class UriUtilsTest { UriUtils.encodeHttpUrl("https://www.ietf.org/rfc/rfc3986.txt", ENC)); assertEquals("Invalid encoded HTTP URL", "http://www.google.com/?q=Z%C3%BCrich", UriUtils.encodeHttpUrl("http://www.google.com/?q=Z\u00fcrich", ENC)); + assertEquals("Invalid encoded HTTP URL", "http://ws.geonames.org/searchJSON?q=T%C5%8Dky%C5%8D&style=FULL&maxRows=300", + UriUtils.encodeHttpUrl("http://ws.geonames.org/searchJSON?q=T\u014dky\u014d&style=FULL&maxRows=300", ENC)); assertEquals("Invalid encoded HTTP URL", "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar", UriUtils.encodeHttpUrl(