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

Polish

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-07-05 09:01:13 +01:00
parent ea10ee5265
commit fbb72eff2e
4 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.web.util;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -644,8 +645,7 @@ public class UriComponentsBuilderTests {
@Test
public void queryParam() {
UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
UriComponents result = builder.queryParam("baz", "qux", 42).build();
UriComponents result = UriComponentsBuilder.newInstance().queryParam("baz", "qux", 42).build();
assertThat(result.getQuery()).isEqualTo("baz=qux&baz=42");
MultiValueMap<String, String> expectedQueryParams = new LinkedMultiValueMap<>(2);
@@ -655,9 +655,9 @@ public class UriComponentsBuilderTests {
}
@Test
public void queryParams() {
public void queryParamWithList() {
UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
UriComponents result = builder.queryParams("baz", Arrays.asList("qux", 42)).build();
UriComponents result = builder.queryParam("baz", Arrays.asList("qux", 42)).build();
assertThat(result.getQuery()).isEqualTo("baz=qux&baz=42");
MultiValueMap<String, String> expectedQueryParams = new LinkedMultiValueMap<>(2);
@@ -679,8 +679,10 @@ public class UriComponentsBuilderTests {
@Test
public void emptyQueryParams() {
UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
UriComponents result = builder.queryParams("baz", Collections.emptyList()).queryParams("foo", null).build();
UriComponents result = UriComponentsBuilder.newInstance()
.queryParam("baz", Collections.emptyList())
.queryParam("foo", (Collection<?>) null)
.build();
assertThat(result.getQuery()).isEqualTo("baz&foo");
MultiValueMap<String, String> expectedQueryParams = new LinkedMultiValueMap<>(2);
@@ -706,14 +708,14 @@ public class UriComponentsBuilderTests {
@Test
public void replaceQueryParams() {
UriComponentsBuilder builder = UriComponentsBuilder.newInstance().queryParams("baz", Arrays.asList("qux", 42));
builder.replaceQueryParams("baz", Arrays.asList("xuq", 24));
UriComponentsBuilder builder = UriComponentsBuilder.newInstance().queryParam("baz", Arrays.asList("qux", 42));
builder.replaceQueryParam("baz", Arrays.asList("xuq", 24));
UriComponents result = builder.build();
assertThat(result.getQuery()).isEqualTo("baz=xuq&baz=24");
builder = UriComponentsBuilder.newInstance().queryParams("baz", Arrays.asList("qux", 42));
builder.replaceQueryParams("baz", Collections.emptyList());
builder = UriComponentsBuilder.newInstance().queryParam("baz", Arrays.asList("qux", 42));
builder.replaceQueryParam("baz", Collections.emptyList());
result = builder.build();
assertThat(result.getQuery()).as("Query param should have been deleted").isNull();