|
16 | 16 |
|
17 | 17 | package org.springframework.web.servlet.mvc.method.annotation;
|
18 | 18 |
|
19 |
| -import static org.junit.Assert.assertEquals; |
20 |
| -import static org.junit.Assert.assertTrue; |
21 |
| - |
22 | 19 | import java.lang.reflect.Method;
|
23 | 20 | import java.util.Arrays;
|
24 | 21 |
|
|
41 | 38 | import org.springframework.web.servlet.FlashMap;
|
42 | 39 | import org.springframework.web.servlet.ModelAndView;
|
43 | 40 |
|
| 41 | +import static org.junit.Assert.*; |
| 42 | + |
44 | 43 | /**
|
45 | 44 | * Unit tests for {@link RequestMappingHandlerAdapter}.
|
46 | 45 | *
|
@@ -72,9 +71,9 @@ public static void setupOnce() {
|
72 | 71 | adapter.setApplicationContext(new StaticWebApplicationContext());
|
73 | 72 | adapter.afterPropertiesSet();
|
74 | 73 |
|
75 |
| - RESOLVER_COUNT = adapter.getArgumentResolvers().getResolvers().size(); |
76 |
| - INIT_BINDER_RESOLVER_COUNT = adapter.getInitBinderArgumentResolvers().getResolvers().size(); |
77 |
| - HANDLER_COUNT = adapter.getReturnValueHandlers().getHandlers().size(); |
| 74 | + RESOLVER_COUNT = adapter.getArgumentResolvers().size(); |
| 75 | + INIT_BINDER_RESOLVER_COUNT = adapter.getInitBinderArgumentResolvers().size(); |
| 76 | + HANDLER_COUNT = adapter.getReturnValueHandlers().size(); |
78 | 77 | }
|
79 | 78 |
|
80 | 79 | @Before
|
@@ -131,7 +130,7 @@ public void setCustomArgumentResolvers() throws Exception {
|
131 | 130 | this.handlerAdapter.setCustomArgumentResolvers(Arrays.asList(resolver));
|
132 | 131 | this.handlerAdapter.afterPropertiesSet();
|
133 | 132 |
|
134 |
| - assertTrue(this.handlerAdapter.getArgumentResolvers().getResolvers().contains(resolver)); |
| 133 | + assertTrue(this.handlerAdapter.getArgumentResolvers().contains(resolver)); |
135 | 134 | assertMethodProcessorCount(RESOLVER_COUNT + 1, INIT_BINDER_RESOLVER_COUNT + 1, HANDLER_COUNT);
|
136 | 135 | }
|
137 | 136 |
|
@@ -159,7 +158,7 @@ public void setCustomReturnValueHandlers() {
|
159 | 158 | this.handlerAdapter.setCustomReturnValueHandlers(Arrays.asList(handler));
|
160 | 159 | this.handlerAdapter.afterPropertiesSet();
|
161 | 160 |
|
162 |
| - assertTrue(this.handlerAdapter.getReturnValueHandlers().getHandlers().contains(handler)); |
| 161 | + assertTrue(this.handlerAdapter.getReturnValueHandlers().contains(handler)); |
163 | 162 | assertMethodProcessorCount(RESOLVER_COUNT, INIT_BINDER_RESOLVER_COUNT, HANDLER_COUNT + 1);
|
164 | 163 | }
|
165 | 164 |
|
@@ -192,9 +191,9 @@ private HandlerMethod handlerMethod(Object handler, String methodName, Class<?>.
|
192 | 191 | }
|
193 | 192 |
|
194 | 193 | private void assertMethodProcessorCount(int resolverCount, int initBinderResolverCount, int handlerCount) {
|
195 |
| - assertEquals(resolverCount, this.handlerAdapter.getArgumentResolvers().getResolvers().size()); |
196 |
| - assertEquals(initBinderResolverCount, this.handlerAdapter.getInitBinderArgumentResolvers().getResolvers().size()); |
197 |
| - assertEquals(handlerCount, this.handlerAdapter.getReturnValueHandlers().getHandlers().size()); |
| 194 | + assertEquals(resolverCount, this.handlerAdapter.getArgumentResolvers().size()); |
| 195 | + assertEquals(initBinderResolverCount, this.handlerAdapter.getInitBinderArgumentResolvers().size()); |
| 196 | + assertEquals(handlerCount, this.handlerAdapter.getReturnValueHandlers().size()); |
198 | 197 | }
|
199 | 198 |
|
200 | 199 |
|
|
0 commit comments