Fix parameterized test display names and polishing

Author: sbrannen

spring-webflux/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingTests.java

@@ -45,9 +45,7 @@ class SimpleUrlHandlerMappingTests {
 
 	@Test
 	void handlerMappingJavaConfig() {
-		AnnotationConfigApplicationContext wac = new AnnotationConfigApplicationContext();
-		wac.register(WebConfig.class);
-		wac.refresh();
+		AnnotationConfigApplicationContext wac = new AnnotationConfigApplicationContext(WebConfig.class);
 
 		HandlerMapping handlerMapping = (HandlerMapping) wac.getBean("handlerMapping");
 		Object mainController = wac.getBean("mainController");
@@ -62,7 +60,6 @@ void handlerMappingJavaConfig() {
 	@Test
 	void handlerMappingXmlConfig() {
 		ClassPathXmlApplicationContext wac = new ClassPathXmlApplicationContext("map.xml", getClass());
-		wac.refresh();
 
 		HandlerMapping handlerMapping = wac.getBean("mapping", HandlerMapping.class);
 		Object mainController = wac.getBean("mainController");

spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java

@@ -16,6 +16,11 @@
 
 package org.springframework.web.servlet.handler;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Collections;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -40,12 +45,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Named.named;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.springframework.web.servlet.HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE;
 import static org.springframework.web.servlet.HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE;
 import static org.springframework.web.servlet.HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE;
 
 /**
  * Tests for {@link SimpleUrlHandlerMapping}.
+ *
  * @author Brian Clozel
  */
 class SimpleUrlHandlerMappingTests {
@@ -73,8 +81,7 @@ void newlineInRequestShouldMatch() throws Exception {
 		assertThat(hec.getHandler()).isSameAs(controller);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolveFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		StaticApplicationContext applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mainController", Object.class);
@@ -91,8 +98,7 @@ void resolveFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(mainController);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolvePatternFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		StaticApplicationContext applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mainController", Object.class);
@@ -109,8 +115,7 @@ void resolvePatternFromMap(SimpleUrlHandlerMapping handlerMapping) throws Except
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(mainController);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolvePathWithParamFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		StaticApplicationContext applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mainController", Object.class);
@@ -127,8 +132,7 @@ void resolvePathWithParamFromMap(SimpleUrlHandlerMapping handlerMapping) throws
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(mainController);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolvePathWithContextFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		StaticApplicationContext applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mainController", Object.class);
@@ -145,8 +149,7 @@ void resolvePathWithContextFromMap(SimpleUrlHandlerMapping handlerMapping) throw
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(mainController);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolvePathWithIncludeFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		StaticApplicationContext applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mainController", Object.class);
@@ -164,8 +167,7 @@ void resolvePathWithIncludeFromMap(SimpleUrlHandlerMapping handlerMapping) throw
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(mainController);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolveDefaultPathFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		StaticApplicationContext applicationContext = new StaticApplicationContext();
 		applicationContext.registerSingleton("mainController", Object.class);
@@ -182,8 +184,7 @@ void resolveDefaultPathFromMap(SimpleUrlHandlerMapping handlerMapping) throws Ex
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(mainController);
 	}
 
-	@ParameterizedTest
-	@MethodSource("handlerMappings")
+	@HandlerMappingsTest
 	void resolveParameterizedControllerFromMap(SimpleUrlHandlerMapping handlerMapping) throws Exception {
 		ParameterizableViewController viewController = new ParameterizableViewController();
 		viewController.setView(new RedirectView("/after/{variable}"));
@@ -196,18 +197,12 @@ void resolveParameterizedControllerFromMap(SimpleUrlHandlerMapping handlerMappin
 		HandlerExecutionChain chain = getHandler(handlerMapping, request);
 
 		assertThat(chain.getHandler()).isSameAs(viewController);
+		@SuppressWarnings("unchecked")
 		Map<String, String> variables = (Map<String, String>) request.getAttribute(URI_TEMPLATE_VARIABLES_ATTRIBUTE);
 		assertThat(variables).containsEntry("variable", "test");
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(viewController);
 	}
 
-	static Stream<Arguments> handlerMappings() {
-		SimpleUrlHandlerMapping defaultConfig = new SimpleUrlHandlerMapping();
-		SimpleUrlHandlerMapping antPatternConfig = new SimpleUrlHandlerMapping();
-		antPatternConfig.setPatternParser(null);
-		return Stream.of(Arguments.of(defaultConfig, "with PathPattern"), Arguments.of(antPatternConfig, "with AntPathMatcher"));
-	}
-
 	private HandlerExecutionChain getHandler(HandlerMapping mapping, MockHttpServletRequest request) throws Exception {
 		HandlerExecutionChain chain = mapping.getHandler(request);
 		Assert.notNull(chain, "No handler found for request: " + request.getRequestURI());
@@ -217,4 +212,23 @@ private HandlerExecutionChain getHandler(HandlerMapping mapping, MockHttpServlet
 		return chain;
 	}
 
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@Documented
+	@ParameterizedTest(name="[{index}] {0}")
+	@MethodSource("handlerMappings")
+	@interface HandlerMappingsTest {
+	}
+
+	static Stream<Arguments> handlerMappings() {
+		SimpleUrlHandlerMapping defaultConfig = new SimpleUrlHandlerMapping();
+		SimpleUrlHandlerMapping antPatternConfig = new SimpleUrlHandlerMapping();
+		antPatternConfig.setPatternParser(null);
+		return Stream.of(
+				arguments(named("with PathPattern", defaultConfig)),
+				arguments(named("with AntPathMatcher", antPatternConfig))
+			);
+	}
+
 }