diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/DefaultMvcTestResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/DefaultMvcTestResult.java index 7513a74b35f..731e99c1b31 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/DefaultMvcTestResult.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/DefaultMvcTestResult.java @@ -18,8 +18,6 @@ package org.springframework.test.web.servlet.assertj; import org.springframework.http.converter.GenericHttpMessageConverter; import org.springframework.lang.Nullable; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.web.servlet.MvcResult; /** @@ -64,14 +62,6 @@ final class DefaultMvcTestResult implements MvcTestResult { return this.unresolvedException; } - public MockHttpServletRequest getRequest() { - return getMvcResult().getRequest(); - } - - public MockHttpServletResponse getResponse() { - return getMvcResult().getResponse(); - } - @Nullable public Exception getResolvedException() { return getMvcResult().getResolvedException(); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResult.java index 9b16c9a1464..805953567eb 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResult.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResult.java @@ -19,6 +19,8 @@ package org.springframework.test.web.servlet.assertj; import org.assertj.core.api.AssertProvider; import org.springframework.lang.Nullable; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.web.servlet.MvcResult; /** @@ -53,6 +55,21 @@ public interface MvcTestResult extends AssertProvider { */ MvcResult getMvcResult(); + /** + * Return the performed {@linkplain MockHttpServletRequest request}. + */ + default MockHttpServletRequest getRequest() { + return getMvcResult().getRequest(); + } + + /** + * Return the resulting {@linkplain MockHttpServletResponse response}. + */ + default MockHttpServletResponse getResponse() { + return getMvcResult().getResponse(); + } + + /** * Return the exception that was thrown unexpectedly while processing the * request, if any. diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResultAssert.java b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResultAssert.java index 7f2225ae370..a75c2dc539c 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResultAssert.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcTestResultAssert.java @@ -55,8 +55,7 @@ public class MvcTestResultAssert extends AbstractMockHttpServletResponseAssert