Polishing

spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -32,7 +32,6 @@ import java.util.Map;
 import javax.servlet.ServletContext;
 import javax.servlet.http.Cookie;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
@@ -58,28 +57,22 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  */
-public class MockHttpServletRequestBuilderTests {
+class MockHttpServletRequestBuilderTests {
 
 	private final ServletContext servletContext = new MockServletContext();
 
-	private MockHttpServletRequestBuilder builder;
+	private MockHttpServletRequestBuilder builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo/bar");
-
-
-	@BeforeEach
-	public void setUp() {
-		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo/bar");
-	}
 
 
 	@Test
-	public void method() {
+	void method() {
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
 		assertThat(request.getMethod()).isEqualTo("GET");
 	}
 
 	@Test
-	public void uri() {
+	void uri() {
 		String uri = "https://java.sun.com:8080/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)";
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, uri);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -94,7 +87,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void requestUriWithEncoding() {
+	void requestUriWithEncoding() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -102,7 +95,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test  // SPR-13435
-	public void requestUriWithDoubleSlashes() throws URISyntaxException {
+	void requestUriWithDoubleSlashes() throws URISyntaxException {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, new URI("/test//currentlyValid/0"));
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -110,13 +103,13 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test // gh-24556
-	public void requestUriWithoutScheme() {
+	void requestUriWithoutScheme() {
 		assertThatIllegalArgumentException().isThrownBy(() -> MockMvcRequestBuilders.get("localhost:8080/path"))
 				.withMessage("'url' should start with a path or be a complete HTTP URL: localhost:8080/path");
 	}
 
 	@Test
-	public void contextPathEmpty() {
+	void contextPathEmpty() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -126,7 +119,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void contextPathServletPathEmpty() {
+	void contextPathServletPathEmpty() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/hotels/42");
 		this.builder.contextPath("/travel");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -137,7 +130,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void contextPathServletPath() {
+	void contextPathServletPath() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/main/hotels/42");
 		this.builder.contextPath("/travel");
 		this.builder.servletPath("/main");
@@ -150,7 +143,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void contextPathServletPathInfoEmpty() {
+	void contextPathServletPathInfoEmpty() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/hotels/42");
 		this.builder.contextPath("/travel");
 		this.builder.servletPath("/hotels/42");
@@ -162,7 +155,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void contextPathServletPathInfo() {
+	void contextPathServletPathInfo() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		this.builder.servletPath("/index.html");
 		this.builder.pathInfo(null);
@@ -174,7 +167,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test // SPR-16453
-	public void pathInfoIsDecoded() {
+	void pathInfoIsDecoded() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/hotels 42");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -182,7 +175,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void contextPathServletPathInvalid() {
+	void contextPathServletPathInvalid() {
 		testContextPathServletPathInvalid("/Foo", "", "Request URI [/foo/bar] does not start with context path [/Foo]");
 		testContextPathServletPathInvalid("foo", "", "Context path must start with a '/'");
 		testContextPathServletPathInvalid("/foo/", "", "Context path must not end with a '/'");
@@ -204,7 +197,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void requestUriAndFragment() {
+	void requestUriAndFragment() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo#bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -212,28 +205,28 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void requestParameter() {
+	void requestParameter() {
 		this.builder.param("foo", "bar", "baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
-		assertThat(parameterMap.get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(parameterMap.get("foo")).containsExactly("bar", "baz");
 	}
 
 	@Test
-	public void requestParameterFromQuery() {
+	void requestParameterFromQuery() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo=bar&foo=baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
-		assertThat(parameterMap.get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(parameterMap.get("foo")).containsExactly("bar", "baz");
 		assertThat(request.getQueryString()).isEqualTo("foo=bar&foo=baz");
 	}
 
 	@Test
-	public void requestParameterFromQueryList() {
+	void requestParameterFromQueryList() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo[0]=bar&foo[1]=baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -244,19 +237,19 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void queryParameter() {
+	void queryParameter() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		this.builder.queryParam("foo", "bar");
 		this.builder.queryParam("foo", "baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 		assertThat(request.getQueryString()).isEqualTo("foo=bar&foo=baz");
 	}
 
 	@Test
-	public void queryParameterMap() {
+	void queryParameterMap() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
 		List<String> values = new ArrayList<>();
@@ -267,12 +260,12 @@ public class MockHttpServletRequestBuilderTests {
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 		assertThat(request.getQueryString()).isEqualTo("foo=bar&foo=baz");
 	}
 
 	@Test
-	public void queryParameterList() {
+	void queryParameterList() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		this.builder.queryParam("foo[0]", "bar");
 		this.builder.queryParam("foo[1]", "baz");
@@ -285,7 +278,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void requestParameterFromQueryWithEncoding() {
+	void requestParameterFromQueryWithEncoding() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo={value}", "bar=baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -295,18 +288,18 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test  // SPR-11043
-	public void requestParameterFromQueryNull() {
+	void requestParameterFromQueryNull() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
-		assertThat(parameterMap.get("foo")).isEqualTo(new String[] {null});
+		assertThat(parameterMap.get("foo")).containsExactly((String) null);
 		assertThat(request.getQueryString()).isEqualTo("foo");
 	}
 
 	@Test  // SPR-13801
-	public void requestParameterFromMultiValueMap() throws Exception {
+	void requestParameterFromMultiValueMap() throws Exception {
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("foo", "bar");
 		params.add("foo", "baz");
@@ -315,11 +308,11 @@ public class MockHttpServletRequestBuilderTests {
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 	}
 
 	@Test
-	public void requestParameterFromRequestBodyFormData() throws Exception {
+	void requestParameterFromRequestBodyFormData() throws Exception {
 		String contentType = "application/x-www-form-urlencoded;charset=UTF-8";
 		String body = "name+1=value+1&name+2=value+A&name+2=value+B&name+3";
 
@@ -327,13 +320,13 @@ public class MockHttpServletRequestBuilderTests {
 				.contentType(contentType).content(body.getBytes(StandardCharsets.UTF_8))
 				.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("name 1")).isEqualTo(new String[] {"value 1"});
+		assertThat(request.getParameterMap().get("name 1")).containsExactly("value 1");
-		assertThat(request.getParameterMap().get("name 2")).isEqualTo(new String[] {"value A", "value B"});
+		assertThat(request.getParameterMap().get("name 2")).containsExactly("value A", "value B");
-		assertThat(request.getParameterMap().get("name 3")).isEqualTo(new String[] {null});
+		assertThat(request.getParameterMap().get("name 3")).containsExactly((String) null);
 	}
 
 	@Test
-	public void acceptHeader() {
+	void acceptHeader() {
 		this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML);
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -346,14 +339,14 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test // gh-2079
-	public void acceptHeaderWithInvalidValues() {
+	void acceptHeaderWithInvalidValues() {
 		this.builder.accept("any", "any2");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getHeader("Accept")).isEqualTo("any, any2");
 	}
 
 	@Test
-	public void contentType() {
+	void contentType() {
 		this.builder.contentType(MediaType.TEXT_HTML);
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -366,7 +359,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void contentTypeViaString() {
+	void contentTypeViaString() {
 		this.builder.contentType("text/html");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -379,14 +372,14 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test // gh-2079
-	public void contentTypeWithInvalidValue() {
+	void contentTypeWithInvalidValue() {
 		this.builder.contentType("any");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getContentType()).isEqualTo("any");
 	}
 
 	@Test  // SPR-11308
-	public void contentTypeViaHeader() {
+	void contentTypeViaHeader() {
 		this.builder.header("Content-Type", MediaType.TEXT_HTML_VALUE);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		String contentType = request.getContentType();
@@ -395,14 +388,14 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test // gh-2079
-	public void contentTypeViaHeaderWithInvalidValue() {
+	void contentTypeViaHeaderWithInvalidValue() {
 		this.builder.header("Content-Type", "yaml");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getContentType()).isEqualTo("yaml");
 	}
 
 	@Test  // SPR-11308
-	public void contentTypeViaMultipleHeaderValues() {
+	void contentTypeViaMultipleHeaderValues() {
 		this.builder.header("Content-Type", MediaType.TEXT_HTML_VALUE, MediaType.ALL_VALUE);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -410,7 +403,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void body() throws IOException {
+	void body() throws IOException {
 		byte[] body = "Hello World".getBytes("UTF-8");
 		this.builder.content(body);
 
@@ -422,7 +415,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void header() {
+	void header() {
 		this.builder.header("foo", "bar", "baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -434,7 +427,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void headers() {
+	void headers() {
 		HttpHeaders httpHeaders = new HttpHeaders();
 		httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 		httpHeaders.put("foo", Arrays.asList("bar", "baz"));
@@ -450,7 +443,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void cookie() {
+	void cookie() {
 		Cookie cookie1 = new Cookie("foo", "bar");
 		Cookie cookie2 = new Cookie("baz", "qux");
 		this.builder.cookie(cookie1, cookie2);
@@ -466,13 +459,13 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void noCookies() {
+	void noCookies() {
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getCookies()).isNull();
 	}
 
 	@Test
-	public void locale() {
+	void locale() {
 		Locale locale = new Locale("nl", "nl");
 		this.builder.locale(locale);
 
@@ -482,7 +475,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void characterEncoding() {
+	void characterEncoding() {
 		String encoding = "UTF-8";
 		this.builder.characterEncoding(encoding);
 
@@ -492,7 +485,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void requestAttribute() {
+	void requestAttribute() {
 		this.builder.requestAttr("foo", "bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -500,7 +493,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void sessionAttribute() {
+	void sessionAttribute() {
 		this.builder.sessionAttr("foo", "bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -508,7 +501,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void sessionAttributes() {
+	void sessionAttributes() {
 		Map<String, Object> map = new HashMap<>();
 		map.put("foo", "bar");
 		this.builder.sessionAttrs(map);
@@ -519,7 +512,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void session() {
+	void session() {
 		MockHttpSession session = new MockHttpSession(this.servletContext);
 		session.setAttribute("foo", "bar");
 		this.builder.session(session);
@@ -533,7 +526,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void flashAttribute() {
+	void flashAttribute() {
 		this.builder.flashAttr("foo", "bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -543,7 +536,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test
-	public void principal() {
+	void principal() {
 		User user = new User();
 		this.builder.principal(user);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -552,7 +545,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test  // SPR-12945
-	public void mergeInvokesDefaultRequestPostProcessorFirst() {
+	void mergeInvokesDefaultRequestPostProcessorFirst() {
 		final String ATTR = "ATTR";
 		final String EXPECTED = "override";
 
@@ -570,7 +563,7 @@ public class MockHttpServletRequestBuilderTests {
 	}
 
 	@Test  // SPR-13719
-	public void arbitraryMethod() {
+	void arbitraryMethod() {
 		String httpMethod = "REPort";
 		URI url = UriComponentsBuilder.fromPath("/foo/{bar}").buildAndExpand(42).toUri();
 		this.builder = new MockHttpServletRequestBuilder(httpMethod, url);

spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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,14 +16,12 @@
 
 package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -37,6 +35,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standal
  * the character encoding.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  *
  * @see JsonPathAssertionTests
  * @see XmlContentAssertionTests
@@ -44,15 +43,11 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standal
  */
 public class ContentAssertionTests {
 
-	private MockMvc mockMvc;
+	private final MockMvc mockMvc = standaloneSetup(new SimpleController()).alwaysExpect(status().isOk()).build();
 
-	@BeforeEach
-	public void setup() {
-		this.mockMvc = standaloneSetup(new SimpleController()).alwaysExpect(status().isOk()).build();
-	}
 
 	@Test
-	public void testContentType() throws Exception {
+	void contentType() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().contentType(MediaType.valueOf("text/plain;charset=ISO-8859-1")))
 			.andExpect(content().contentType("text/plain;charset=ISO-8859-1"))
@@ -67,8 +62,7 @@ public class ContentAssertionTests {
 	}
 
 	@Test
-	public void testContentAsString() throws Exception {
+	void contentAsString() throws Exception {
-
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().string("Hello world!"));
 
@@ -81,8 +75,7 @@ public class ContentAssertionTests {
 	}
 
 	@Test
-	public void testContentAsBytes() throws Exception {
+	void contentAsBytes() throws Exception {
-
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().bytes("Hello world!".getBytes("ISO-8859-1")));
 
@@ -91,14 +84,13 @@ public class ContentAssertionTests {
 	}
 
 	@Test
-	public void testContentStringMatcher() throws Exception {
+	void contentStringMatcher() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().string(containsString("world")));
 	}
 
 	@Test
-	public void testCharacterEncoding() throws Exception {
+	void characterEncoding() throws Exception {
-
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().encoding("ISO-8859-1"))
 			.andExpect(content().string(containsString("world")));
@@ -109,18 +101,16 @@ public class ContentAssertionTests {
 	}
 
 
-	@Controller
+	@RestController
 	private static class SimpleController {
 
-		@RequestMapping(value="/handle", produces="text/plain")
+		@GetMapping(path="/handle", produces="text/plain")
-		@ResponseBody
+		String handle() {
-		public String handle() {
 			return "Hello world!";
 		}
 
-		@RequestMapping(value="/handleUtf8", produces="text/plain;charset=UTF-8")
+		@GetMapping(path="/handleUtf8", produces="text/plain;charset=UTF-8")
-		@ResponseBody
+		String handleWithCharset() {
-		public String handleWithCharset() {
 			return "\u3053\u3093\u306b\u3061\u306f\u4e16\u754c\uff01";	// "Hello world! (Japanese)
 		}
 	}