Browse Source

Reinstate AbstractBeanFactoryTests.typeMismatch() test

pull/23569/head
Sam Brannen 6 years ago
parent
commit
0b63db26b7
  1. 18
      spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java

18
spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java

@ -22,7 +22,7 @@ import java.util.StringTokenizer; @@ -22,7 +22,7 @@ import java.util.StringTokenizer;
import org.junit.jupiter.api.Test;
import org.springframework.beans.BeansException;
import org.springframework.beans.PropertyBatchUpdateException;
import org.springframework.beans.TypeMismatchException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanIsNotAFactoryException;
@ -191,17 +191,11 @@ public abstract class AbstractBeanFactoryTests { @@ -191,17 +191,11 @@ public abstract class AbstractBeanFactoryTests {
assertThat(ve.getName() == null && ve.getAge() == 0 && ve.getSpouse() == null).as("Valid empty has defaults").isTrue();
}
public void xtestTypeMismatch() {
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
getBeanFactory().getBean("typeMismatch"))
.withCauseInstanceOf(PropertyBatchUpdateException.class)
.satisfies(ex -> {
assertThat(ex.getBeanName()).isEqualTo("typeMismatch");
PropertyBatchUpdateException pex = (PropertyBatchUpdateException) ex.getCause();
assertThat(pex.getExceptionCount()).isEqualTo(1);
assertThat(pex.getPropertyAccessException("age")).isNotNull();
assertThat(pex.getPropertyAccessException("age").getPropertyChangeEvent().getNewValue()).isEqualTo("34x");
});
@Test
public void typeMismatch() {
assertThatExceptionOfType(BeanCreationException.class)
.isThrownBy(() -> getBeanFactory().getBean("typeMismatch"))
.withCauseInstanceOf(TypeMismatchException.class);
}
@Test

Loading…
Cancel
Save