Call complete() on MockAsyncContext after dispatch

Issue: SPR-13615

spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java

@@ -18,6 +18,7 @@ package org.springframework.test.web.servlet;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 
@@ -147,14 +148,18 @@ public final class MockMvc {
 		final MvcResult mvcResult = new DefaultMvcResult(request, response);
 		request.setAttribute(MVC_RESULT_ATTRIBUTE, mvcResult);
 
-		// [SPR-13217] Simulate RequestContextFilter to ensure that RequestAttributes are
-		// populated before filters are invoked.
 		RequestAttributes previousAttributes = RequestContextHolder.getRequestAttributes();
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request, response));
 
 		MockFilterChain filterChain = new MockFilterChain(this.servlet, this.filters);
 		filterChain.doFilter(request, response);
 
+		if (DispatcherType.ASYNC.equals(request.getDispatcherType()) &&
+				request.getAsyncContext() != null & !request.isAsyncStarted()) {
+
+			request.getAsyncContext().complete();
+		}
+
 		applyDefaultResultActions(mvcResult);
 
 		RequestContextHolder.setRequestAttributes(previousAttributes);

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

@@ -17,6 +17,7 @@
 package org.springframework.test.web.servlet.request;
 
 import java.net.URI;
+import javax.servlet.DispatcherType;
 import javax.servlet.ServletContext;
 
 import org.springframework.http.HttpMethod;
@@ -237,6 +238,7 @@ public abstract class MockMvcRequestBuilders {
 			@Override
 			public MockHttpServletRequest buildRequest(ServletContext servletContext) {
 				MockHttpServletRequest request = mvcResult.getRequest();
+				request.setDispatcherType(DispatcherType.ASYNC);
 				request.setAsyncStarted(false);
 				return request;
 			}

spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java

@@ -0,0 +1,134 @@
+/*
+ * Copyright 2002-2015 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.web.servlet.samples.context;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.ContextHierarchy;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.request.async.CallableProcessingInterceptor;
+import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import static org.mockito.Matchers.any;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * Tests with Java configuration.
+ *
+ * @author Rossen Stoyanchev
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextHierarchy(@ContextConfiguration(classes = AsyncControllerJavaConfigTests.WebConfig.class))
+public class AsyncControllerJavaConfigTests {
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	@Autowired
+	private CallableProcessingInterceptor callableInterceptor;
+
+	private MockMvc mockMvc;
+
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// SPR-13615
+
+	@Test
+	public void callableInterceptor() throws Exception {
+		MvcResult mvcResult = this.mockMvc.perform(get("/callable").accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(request().asyncStarted())
+				.andExpect(request().asyncResult(Collections.singletonMap("key", "value")))
+				.andReturn();
+
+		Mockito.verify(this.callableInterceptor).beforeConcurrentHandling(any(), any());
+		Mockito.verify(this.callableInterceptor).preProcess(any(), any());
+		Mockito.verify(this.callableInterceptor).postProcess(any(), any(), any());
+		Mockito.verifyNoMoreInteractions(this.callableInterceptor);
+
+		this.mockMvc.perform(asyncDispatch(mvcResult))
+				.andExpect(status().isOk())
+				.andExpect(content().string("{\"key\":\"value\"}"));
+
+		Mockito.verify(this.callableInterceptor).afterCompletion(any(), any());
+		Mockito.verifyNoMoreInteractions(this.callableInterceptor);
+	}
+
+
+	@Configuration
+	@EnableWebMvc
+	@SuppressWarnings("unused")
+	static class WebConfig extends WebMvcConfigurerAdapter {
+
+		@Override
+		public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+			configurer.registerCallableInterceptors(callableInterceptor());
+		}
+
+		@Bean
+		public CallableProcessingInterceptor callableInterceptor() {
+			return Mockito.mock(CallableProcessingInterceptor.class);
+		}
+
+		@Bean
+		public AsyncController asyncController() {
+			return new AsyncController();
+		}
+
+	}
+
+	@RestController
+	@SuppressWarnings("unused")
+	static class AsyncController {
+
+		@RequestMapping(path = "/callable")
+		public Callable<Map<String, String>> getCallable() {
+			return () -> Collections.singletonMap("key", "value");
+		}
+	}
+
+}

spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java

@@ -143,6 +143,7 @@ public class JavaConfigTests {
 
 	@Configuration
 	@EnableWebMvc
+	@SuppressWarnings("unused")
 	static class WebConfig extends WebMvcConfigurerAdapter {
 
 		@Autowired