Skip to content

Commit 4bbfd4c

Browse files
committed
Add convenient request/response accessors on MvcTestResult
Closes gh-32846
1 parent 268043a commit 4bbfd4c

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

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

-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import org.springframework.http.converter.GenericHttpMessageConverter;
2020
import org.springframework.lang.Nullable;
21-
import org.springframework.mock.web.MockHttpServletRequest;
22-
import org.springframework.mock.web.MockHttpServletResponse;
2321
import org.springframework.test.web.servlet.MvcResult;
2422

2523
/**
@@ -64,14 +62,6 @@ public Exception getUnresolvedException() {
6462
return this.unresolvedException;
6563
}
6664

67-
public MockHttpServletRequest getRequest() {
68-
return getMvcResult().getRequest();
69-
}
70-
71-
public MockHttpServletResponse getResponse() {
72-
return getMvcResult().getResponse();
73-
}
74-
7565
@Nullable
7666
public Exception getResolvedException() {
7767
return getMvcResult().getResolvedException();

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

+17
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.assertj.core.api.AssertProvider;
2020

2121
import org.springframework.lang.Nullable;
22+
import org.springframework.mock.web.MockHttpServletRequest;
23+
import org.springframework.mock.web.MockHttpServletResponse;
2224
import org.springframework.test.web.servlet.MvcResult;
2325

2426
/**
@@ -53,6 +55,21 @@ public interface MvcTestResult extends AssertProvider<MvcTestResultAssert> {
5355
*/
5456
MvcResult getMvcResult();
5557

58+
/**
59+
* Return the performed {@linkplain MockHttpServletRequest request}.
60+
*/
61+
default MockHttpServletRequest getRequest() {
62+
return getMvcResult().getRequest();
63+
}
64+
65+
/**
66+
* Return the resulting {@linkplain MockHttpServletResponse response}.
67+
*/
68+
default MockHttpServletResponse getResponse() {
69+
return getMvcResult().getResponse();
70+
}
71+
72+
5673
/**
5774
* Return the exception that was thrown unexpectedly while processing the
5875
* request, if any.

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public class MvcTestResultAssert extends AbstractMockHttpServletResponseAssert<M
5555

5656
@Override
5757
protected MockHttpServletResponse getResponse() {
58-
getMvcResult();
59-
return this.actual.getMvcResult().getResponse();
58+
return getMvcResult().getResponse();
6059
}
6160

6261
/**

0 commit comments

Comments
 (0)