Polish tests and test fixtures in spring-test

spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java

@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
  */
 class MockHttpSessionTests {
 
-	private MockHttpSession session = new MockHttpSession();
+	private final MockHttpSession session = new MockHttpSession();
 
 
 	@Test

spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java

@@ -118,7 +118,7 @@ class TestContextConcurrencyTests {
 
 	private static class TrackingListener implements TestExecutionListener {
 
-		private ThreadLocal<String> methodName = new ThreadLocal<>();
+		private final ThreadLocal<String> methodName = new ThreadLocal<>();
 
 
 		@Override

spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java

@@ -47,7 +47,7 @@ import static org.springframework.test.context.cache.ContextCacheTestUtils.asser
  */
 class ContextCacheTests {
 
-	private ContextCache contextCache = new DefaultContextCache();
+	private final ContextCache contextCache = new DefaultContextCache();
 
 
 	@BeforeEach

spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java

@@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock;
  */
 public class SpringFailOnTimeoutTests {
 
-	private Statement statement = mock(Statement.class);
+	private final Statement statement = mock(Statement.class);
 
 
 	@Test

spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java

@@ -68,16 +68,16 @@ public class Component {
 
 	int add(int... args) {
 		int sum = 0;
-		for (int i = 0; i < args.length; i++) {
+		for (int arg : args) {
-			sum += args[i];
+			sum += arg;
 		}
 		return sum;
 	}
 
 	int multiply(Integer... args) {
 		int product = 1;
-		for (int i = 0; i < args.length; i++) {
+		for (Integer arg : args) {
-			product *= args[i];
+			product *= arg;
 		}
 		return product;
 	}

spring-test/src/test/java/org/springframework/test/web/Person.java

@@ -70,10 +70,9 @@ public class Person {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof Person)) {
+		if (!(other instanceof Person otherPerson)) {
 			return false;
 		}
-		Person otherPerson = (Person) other;
 		return (ObjectUtils.nullSafeEquals(this.name, otherPerson.name) &&
 				ObjectUtils.nullSafeEquals(this.someDouble, otherPerson.someDouble) &&
 				ObjectUtils.nullSafeEquals(this.someBoolean, otherPerson.someBoolean));

spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java

@@ -45,8 +45,12 @@ class Person {
 
 	@Override
 	public boolean equals(Object other) {
-		if (this == other) return true;
+		if (this == other) {
-		if (other == null || getClass() != other.getClass()) return false;
+			return true;
+		}
+		if (other == null || getClass() != other.getClass()) {
+			return false;
+		}
 		Person person = (Person) other;
 		return getName().equals(person.getName());
 	}

spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java

@@ -347,7 +347,7 @@ public class PrintingResultHandlerTests {
 
 			private String printedHeading;
 
-			private Map<String, Map<String, Object>> printedValues = new HashMap<>();
+			private final Map<String, Map<String, Object>> printedValues = new HashMap<>();
 
 			@Override
 			public void printHeading(String heading) {

spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java

@@ -117,9 +117,7 @@ public class EncodedUriTests {
 
 		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-			if (bean instanceof RequestMappingHandlerMapping) {
+			if (bean instanceof RequestMappingHandlerMapping requestMappingHandlerMapping) {
-				RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) bean;
-
 				// URL decode after request mapping, not before.
 				requestMappingHandlerMapping.setUrlDecode(false);
 			}

spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java

@@ -86,7 +86,7 @@ public class HttpOptionsTests {
 	@Controller
 	private static class MyController {
 
-		private AtomicInteger counter = new AtomicInteger();
+		private final AtomicInteger counter = new AtomicInteger();
 
 
 		@RequestMapping(value = "/myUrl", method = RequestMethod.OPTIONS)

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

@@ -85,7 +85,7 @@ public class FrameworkExtensionTests {
 	 */
 	private static class TestRequestPostProcessor implements RequestPostProcessor {
 
-		private HttpHeaders headers = new HttpHeaders();
+		private final HttpHeaders headers = new HttpHeaders();
 
 
 		public TestRequestPostProcessor foo(String value) {