diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java index 8c138078f6..35a686287f 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java @@ -15,7 +15,6 @@ */ package org.springframework.test.web.servlet; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import org.springframework.mock.web.MockHttpServletRequest; @@ -52,8 +51,6 @@ class DefaultMvcResult implements MvcResult { private final AtomicReference asyncResult = new AtomicReference(RESULT_NONE); - private CountDownLatch asyncResultLatch; - /** * Create a new instance with the given request and response. diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java index 575483a61f..00fb902fcf 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java @@ -15,17 +15,11 @@ */ package org.springframework.test.web.servlet; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import javax.servlet.AsyncContext; - import org.junit.Before; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import static org.junit.Assert.assertEquals; -import static org.mockito.BDDMockito.*; /** * Test fixture for {@link DefaultMvcResult}. @@ -34,22 +28,18 @@ import static org.mockito.BDDMockito.*; */ public class DefaultMvcResultTests { - private static final long DEFAULT_TIMEOUT = 10000L; - private DefaultMvcResult mvcResult; - @Before public void setup() { MockHttpServletRequest request = new MockHttpServletRequest(); - request.setAsyncStarted(true); this.mvcResult = new DefaultMvcResult(request, null); } @Test public void getAsyncResultSuccess() throws Exception { this.mvcResult.setAsyncResult("Foo"); - assertEquals("Foo", this.mvcResult.getAsyncResult(10 * 1000)); + assertEquals("Foo", this.mvcResult.getAsyncResult()); } @Test(expected = IllegalStateException.class)