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

Test status quo for Ordered support for @ControllerAdvice beans

Browse Source 
See gh-23163
This commit is contained in:
Sam Brannen
2019-06-22 18:18:57 +03:00
parent e2d01bb783
commit 8f30639a0a
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
View File

@@ -32,6 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
/**
* Unit tests for {@link ControllerAdviceBean}.
@@ -89,22 +91,39 @@ public class ControllerAdviceBeanTests {
assertEqualsHashCodeAndToString(bean1, bean2, toString);
}
@Test
public void orderedWithLowestPrecedenceByDefaultForBeanName() {
assertOrder(SimpleControllerAdvice.class, Ordered.LOWEST_PRECEDENCE);
}
@Test
public void orderedWithLowestPrecedenceByDefaultForBeanInstance() {
assertOrder(new SimpleControllerAdvice(), Ordered.LOWEST_PRECEDENCE);
}
@Test
public void orderedViaOrderedInterfaceForBeanName() {
// TODO Change expectedOrder once Ordered is properly supported
assertOrder(OrderedControllerAdvice.class, Ordered.LOWEST_PRECEDENCE);
}
@Test
public void orderedViaOrderedInterfaceForBeanInstance() {
assertOrder(new OrderedControllerAdvice(), 42);
}
@Test
public void orderedViaAnnotationForBeanName() {
assertOrder(OrderAnnotationControllerAdvice.class, 42);
assertOrder(PriorityAnnotationControllerAdvice.class, 42);
}
@Test
public void orderedViaAnnotationForBeanInstance() {
assertOrder(new OrderAnnotationControllerAdvice(), 42);
assertOrder(new PriorityAnnotationControllerAdvice(), 42);
}
@Test
public void orderedViaOrderedInterfaceForBeanInstance() {
assertOrder(new OrderedControllerAdvice(), 42);
}
@Test
public void shouldMatchAll() {
ControllerAdviceBean bean = new ControllerAdviceBean(new SimpleControllerAdvice());
@@ -186,6 +205,23 @@ public class ControllerAdviceBeanTests {
assertThat(new ControllerAdviceBean(bean).getOrder()).isEqualTo(expectedOrder);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private void assertOrder(Class beanType, int expectedOrder) {
String beanName = "myBean";
BeanFactory beanFactory = mock(BeanFactory.class);
given(beanFactory.containsBean(beanName)).willReturn(true);
given(beanFactory.getType(beanName)).willReturn(beanType);
ControllerAdviceBean controllerAdviceBean = new ControllerAdviceBean(beanName, beanFactory);
assertThat(controllerAdviceBean.getOrder()).isEqualTo(expectedOrder);
verify(beanFactory).containsBean(beanName);
verify(beanFactory).getType(beanName);
// Expecting 0 invocations of getBean() since Ordered is not yet supported.
// TODO Change expected number of invocations once Ordered is properly supported
verify(beanFactory, times(0)).getBean(beanName);
}
private void assertApplicable(String message, ControllerAdviceBean controllerAdvice, Class<?> controllerBeanType) {
assertThat(controllerAdvice).isNotNull();
assertThat(controllerAdvice.isApplicableToBeanType(controllerBeanType)).as(message).isTrue();