From 8c127ad3c9b3ebbad542b20d37760e33ea6c9641 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Wed, 11 Nov 2015 15:14:18 -0500
Subject: [PATCH] Property init HandlerMapping in standalone MockMvc

Issue: SPR-13637
---
 .../setup/StandaloneMockMvcBuilder.java       |  1 +
 .../setup/StandaloneMockMvcBuilderTests.java  | 44 +++++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index 0e96ba4e47..bf965cca42 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -342,6 +342,7 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
 		StaticRequestMappingHandlerMapping hm = config.getHandlerMapping();
 		hm.setServletContext(wac.getServletContext());
 		hm.setApplicationContext(wac);
+		hm.afterPropertiesSet();
 		hm.registerHandlers(this.controllers);
 		wac.addBean("requestMappingHandlerMapping", hm);
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
index 41595c3785..fb441308fe 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -50,9 +51,10 @@ import static org.junit.Assert.*;
  */
 public class StandaloneMockMvcBuilderTests {
 
-	@Test  // SPR-10825
-	public void placeHoldersInRequestMapping() throws Exception {
+	// SPR-10825
 
+	@Test
+	public void placeHoldersInRequestMapping() throws Exception {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PlaceholderController());
 		builder.addPlaceHolderValue("sys.login.ajax", "/foo");
 		builder.build();
@@ -66,7 +68,29 @@ public class StandaloneMockMvcBuilderTests {
 		assertEquals("handleWithPlaceholders", ((HandlerMethod) chain.getHandler()).getMethod().getName());
 	}
 
-	@Test  // SPR-12553
+	// SPR-13637
+
+	@Test
+	public void suffixPatternMatch() throws Exception {
+		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PersonController());
+		builder.setUseSuffixPatternMatch(false);
+		builder.build();
+
+		RequestMappingHandlerMapping hm = builder.wac.getBean(RequestMappingHandlerMapping.class);
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/persons");
+		HandlerExecutionChain chain = hm.getHandler(request);
+		assertNotNull(chain);
+		assertEquals("persons", ((HandlerMethod) chain.getHandler()).getMethod().getName());
+
+		request = new MockHttpServletRequest("GET", "/persons.xml");
+		chain = hm.getHandler(request);
+		assertNull(chain);
+	}
+
+	// SPR-12553
+
+	@Test
 	public void applicationContextAttribute() {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PlaceholderController());
 		builder.addPlaceHolderValue("sys.login.ajax", "/foo");
@@ -100,7 +124,9 @@ public class StandaloneMockMvcBuilderTests {
 		builder.addFilter(new ContinueFilter(), (String) null);
 	}
 
-	@Test  // SPR-13375
+	// SPR-13375
+
+	@Test
 	@SuppressWarnings("rawtypes")
 	public void springHandlerInstantiator() {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PersonController());
@@ -112,6 +138,7 @@ public class StandaloneMockMvcBuilderTests {
 
 
 	@Controller
+	@SuppressWarnings("unused")
 	private static class PlaceholderController {
 
 		@RequestMapping(value = "${sys.login.ajax}")
@@ -135,7 +162,14 @@ public class StandaloneMockMvcBuilderTests {
 	}
 
 	@Controller
+	@SuppressWarnings("unused")
 	private static class PersonController {
+
+		@RequestMapping(value="/persons")
+		public String persons() {
+			return null;
+		}
+
 		@RequestMapping(value="/forward")
 		public String forward() {
 			return "forward:/persons";
@@ -143,9 +177,11 @@ public class StandaloneMockMvcBuilderTests {
 	}
 
 	private class ContinueFilter extends OncePerRequestFilter {
+
 		@Override
 		protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
 				FilterChain filterChain) throws ServletException, IOException {
+
 			filterChain.doFilter(request, response);
 		}
 	}