Polishing

(cherry picked from commit aa5c12c)

spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java

@@ -64,9 +64,7 @@ public class ServletServerHttpRequestTests {
 		assertEquals("Invalid uri", uri, request.getURI());
 	}
 
-	// SPR-13876
-
-	@Test
+	@Test  // SPR-13876
 	public void getUriWithEncoding() throws Exception {
         URI uri = new URI("https://example.com/%E4%B8%AD%E6%96%87" +
 				"?redirect=https%3A%2F%2Fgithub.com%2Fspring-projects%2Fspring-framework");

spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 
-import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 /**
@@ -196,9 +196,7 @@ public class InvocableHandlerMethodTests {
 		}
 	}
 
-	// SPR-13917
-
-	@Test
+	@Test  // SPR-13917
 	public void invocationErrorMessage() throws Exception {
 		HandlerMethodArgumentResolverComposite composite = new HandlerMethodArgumentResolverComposite();
 		composite.addResolver(new StubArgumentResolver(double.class, null));

spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java

@@ -16,13 +16,12 @@
 
 package org.springframework.web.method.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.ui.ModelMap;
 
+import static org.junit.Assert.*;
 
 /**
  * Test fixture for {@link ModelAndViewContainer}.
@@ -76,7 +75,7 @@ public class ModelAndViewContainerTests {
 		assertTrue(this.mavContainer.getModel().isEmpty());
 	}
 
-	@Test // SPR-14045
+	@Test  // SPR-14045
 	public void ignoreDefaultModelAndWithoutRedirectModel() {
 		this.mavContainer.setIgnoreDefaultModelOnRedirect(true);
 		this.mavContainer.setRedirectModelScenario(true);