Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-07-30 17:34:29 +02:00
parent 5e15bbfbf1 b2c56590dd
commit 8ef557df2f
16 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
View File

@@ -41,7 +41,7 @@ public class HandlerMethodArgumentResolverCompositeTests {
@Before
public void setUp() throws Exception {
public void setup() throws Exception {
this.resolverComposite = new HandlerMethodArgumentResolverComposite();
Method method = getClass().getDeclaredMethod("handle", Integer.class, String.class);
@@ -51,7 +51,7 @@ public class HandlerMethodArgumentResolverCompositeTests {
@Test
public void supportsParameter() {
public void supportsParameter() throws Exception {
this.resolverComposite.addResolver(new StubArgumentResolver(Integer.class));
assertThat(this.resolverComposite.supportsParameter(paramInt)).isTrue();

8
spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
View File

@@ -30,6 +30,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* Test fixture with {@link HandlerMethodReturnValueHandlerComposite}.
*
* @author Rossen Stoyanchev
*/
@SuppressWarnings("unused")
@@ -47,8 +48,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
@Before
public void setUp() throws Exception {
public void setup() throws Exception {
this.integerType = new MethodParameter(getClass().getDeclaredMethod("handleInteger"), -1);
this.stringType = new MethodParameter(getClass().getDeclaredMethod("handleString"), -1);
@@ -61,6 +61,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
mavContainer = new ModelAndViewContainer();
}
@Test
public void supportsReturnType() throws Exception {
assertThat(this.handlers.supportsReturnType(this.integerType)).isTrue();
@@ -84,9 +85,8 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
verifyNoMoreInteractions(anotherIntegerHandler);
}
@Test // SPR-13083
@Test // SPR-13083
public void handleReturnValueWithAsyncHandler() throws Exception {
Promise<Integer> promise = new Promise<>();
MethodParameter promiseType = new MethodParameter(getClass().getDeclaredMethod("handlePromise"), -1);