Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add test for UriUtils.encode(String, Charset)

Browse Source 
Issue: SPR-17451
This commit is contained in:
Arjen Poutsma
2018-11-20 10:51:19 +01:00
parent abf9ce8a34
commit f3c29fe2e6
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
package org.springframework.web.util;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -35,43 +34,43 @@ public class UriUtilsTests {
@Test
public void encodeScheme() throws UnsupportedEncodingException {
public void encodeScheme() {
assertEquals("Invalid encoded result", "foobar+-.", UriUtils.encodeScheme("foobar+-.", CHARSET));
assertEquals("Invalid encoded result", "foo%20bar", UriUtils.encodeScheme("foo bar", CHARSET));
}
@Test
public void encodeUserInfo() throws UnsupportedEncodingException {
public void encodeUserInfo() {
assertEquals("Invalid encoded result", "foobar:", UriUtils.encodeUserInfo("foobar:", CHARSET));
assertEquals("Invalid encoded result", "foo%20bar", UriUtils.encodeUserInfo("foo bar", CHARSET));
}
@Test
public void encodeHost() throws UnsupportedEncodingException {
public void encodeHost() {
assertEquals("Invalid encoded result", "foobar", UriUtils.encodeHost("foobar", CHARSET));
assertEquals("Invalid encoded result", "foo%20bar", UriUtils.encodeHost("foo bar", CHARSET));
}
@Test
public void encodePort() throws UnsupportedEncodingException {
public void encodePort() {
assertEquals("Invalid encoded result", "80", UriUtils.encodePort("80", CHARSET));
}
@Test
public void encodePath() throws UnsupportedEncodingException {
public void encodePath() {
assertEquals("Invalid encoded result", "/foo/bar", UriUtils.encodePath("/foo/bar", CHARSET));
assertEquals("Invalid encoded result", "/foo%20bar", UriUtils.encodePath("/foo bar", CHARSET));
assertEquals("Invalid encoded result", "/Z%C3%BCrich", UriUtils.encodePath("/Z\u00fcrich", CHARSET));
}
@Test
public void encodePathSegment() throws UnsupportedEncodingException {
public void encodePathSegment() {
assertEquals("Invalid encoded result", "foobar", UriUtils.encodePathSegment("foobar", CHARSET));
assertEquals("Invalid encoded result", "%2Ffoo%2Fbar", UriUtils.encodePathSegment("/foo/bar", CHARSET));
}
@Test
public void encodeQuery() throws UnsupportedEncodingException {
public void encodeQuery() {
assertEquals("Invalid encoded result", "foobar", UriUtils.encodeQuery("foobar", CHARSET));
assertEquals("Invalid encoded result", "foo%20bar", UriUtils.encodeQuery("foo bar", CHARSET));
assertEquals("Invalid encoded result", "foobar/+", UriUtils.encodeQuery("foobar/+", CHARSET));
@@ -79,21 +78,28 @@ public class UriUtilsTests {
}
@Test
public void encodeQueryParam() throws UnsupportedEncodingException {
public void encodeQueryParam() {
assertEquals("Invalid encoded result", "foobar", UriUtils.encodeQueryParam("foobar", CHARSET));
assertEquals("Invalid encoded result", "foo%20bar", UriUtils.encodeQueryParam("foo bar", CHARSET));
assertEquals("Invalid encoded result", "foo%26bar", UriUtils.encodeQueryParam("foo&bar", CHARSET));
}
@Test
public void encodeFragment() throws UnsupportedEncodingException {
public void encodeFragment() {
assertEquals("Invalid encoded result", "foobar", UriUtils.encodeFragment("foobar", CHARSET));
assertEquals("Invalid encoded result", "foo%20bar", UriUtils.encodeFragment("foo bar", CHARSET));
assertEquals("Invalid encoded result", "foobar/", UriUtils.encodeFragment("foobar/", CHARSET));
}
@Test
public void decode() throws UnsupportedEncodingException {
public void encode() {
assertEquals("Invalid encoded result", "foo", UriUtils.encode("foo", CHARSET));
assertEquals("Invalid encoded result", "http%3A%2F%2Fexample.com%2Ffoo%20bar",
UriUtils.encode("http://example.com/foo bar", CHARSET));
}
@Test
public void decode() {
assertEquals("Invalid encoded URI", "", UriUtils.decode("", CHARSET));
assertEquals("Invalid encoded URI", "foobar", UriUtils.decode("foobar", CHARSET));
assertEquals("Invalid encoded URI", "foo bar", UriUtils.decode("foo%20bar", CHARSET));
@@ -104,7 +110,7 @@ public class UriUtilsTests {
}
@Test(expected = IllegalArgumentException.class)
public void decodeInvalidSequence() throws UnsupportedEncodingException {
public void decodeInvalidSequence() {
UriUtils.decode("foo%2", CHARSET);
}