Polishing

(cherry picked from commit 8ddb432)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.util.Assert;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -60,55 +60,56 @@ public DefaultMvcResult(MockHttpServletRequest request, MockHttpServletResponse
 		this.mockResponse = response;
 	}
 
-	@Override
-	public MockHttpServletResponse getResponse() {
-		return mockResponse;
-	}
 
 	@Override
 	public MockHttpServletRequest getRequest() {
-		return mockRequest;
+		return this.mockRequest;
 	}
 
 	@Override
-	public Object getHandler() {
-		return this.handler;
+	public MockHttpServletResponse getResponse() {
+		return this.mockResponse;
 	}
 
 	public void setHandler(Object handler) {
 		this.handler = handler;
 	}
 
 	@Override
-	public HandlerInterceptor[] getInterceptors() {
-		return this.interceptors;
+	public Object getHandler() {
+		return this.handler;
 	}
 
-	public void setInterceptors(HandlerInterceptor[] interceptors) {
+	public void setInterceptors(HandlerInterceptor... interceptors) {
 		this.interceptors = interceptors;
 	}
 
 	@Override
-	public Exception getResolvedException() {
-		return this.resolvedException;
+	public HandlerInterceptor[] getInterceptors() {
+		return this.interceptors;
 	}
 
 	public void setResolvedException(Exception resolvedException) {
 		this.resolvedException = resolvedException;
 	}
 
 	@Override
-	public ModelAndView getModelAndView() {
-		return this.modelAndView;
+	public Exception getResolvedException() {
+		return this.resolvedException;
 	}
 
 	public void setModelAndView(ModelAndView mav) {
 		this.modelAndView = mav;
 	}
 
+	@Override
+	public ModelAndView getModelAndView() {
+		return this.modelAndView;
+	}
+
 	@Override
 	public FlashMap getFlashMap() {
-		return RequestContextUtils.getOutputFlashMap(mockRequest);
+		return RequestContextUtils.getOutputFlashMap(this.mockRequest);
 	}
 
 	public void setAsyncResult(Object asyncResult) {
@@ -122,7 +123,6 @@ public Object getAsyncResult() {
 
 	@Override
 	public Object getAsyncResult(long timeToWait) {
-
 		if (this.mockRequest.getAsyncContext() != null) {
 			timeToWait = (timeToWait == -1 ? this.mockRequest.getAsyncContext().getTimeout() : timeToWait);
 		}
@@ -131,7 +131,7 @@ public Object getAsyncResult(long timeToWait) {
 			long endTime = System.currentTimeMillis() + timeToWait;
 			while (System.currentTimeMillis() < endTime && this.asyncResult.get() == RESULT_NONE) {
 				try {
-					Thread.sleep(200);
+					Thread.sleep(100);
 				}
 				catch (InterruptedException ex) {
 					throw new IllegalStateException("Interrupted while waiting for " +
@@ -140,11 +140,12 @@ public Object getAsyncResult(long timeToWait) {
 			}
 		}
 
-		Assert.state(this.asyncResult.get() != RESULT_NONE,
-				"Async result for handler [" + this.handler + "] " +
-						"was not set during the specified timeToWait=" + timeToWait);
-
-		return this.asyncResult.get();
+		Object result = this.asyncResult.get();
+		if (result == RESULT_NONE) {
+			throw new IllegalStateException("Async result for handler [" + this.handler + "] " +
+					"was not set during the specified timeToWait=" + timeToWait);
+		}
+		return result;
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -64,7 +64,6 @@ public interface MvcResult {
 	/**
 	 * Return any exception raised by a handler and successfully resolved
 	 * through a {@link HandlerExceptionResolver}.
-	 *
 	 * @return an exception, possibly {@code null}
 	 */
  	Exception getResolvedException();
@@ -79,20 +78,17 @@ public interface MvcResult {
 	 * Get the result of async execution. This method will wait for the async result
 	 * to be set for up to the amount of time configured on the async request,
 	 * i.e. {@link org.springframework.mock.web.MockAsyncContext#getTimeout()}.
-	 *
-	 * @throws IllegalStateException if the async result was not set.
+	 * @throws IllegalStateException if the async result was not set
 	 */
 	Object getAsyncResult();
 
 	/**
 	 * Get the result of async execution. This method will wait for the async result
 	 * to be set for up to the specified amount of time.
-	 *
 	 * @param timeToWait how long to wait for the async result to be set, in
 	 * 	milliseconds; if -1, then the async request timeout value is used,
 	 *  i.e.{@link org.springframework.mock.web.MockAsyncContext#getTimeout()}.
-	 *
-	 * @throws IllegalStateException if the async result was not set.
+	 * @throws IllegalStateException if the async result was not set
 	 */
 	Object getAsyncResult(long timeToWait);