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

DATACMNS-300 - Fixed exception handling in ReflectionEntityInstantiator.

Browse Source 
ReflectionEntityInstantiator now actually throws the wrapped exception created in the catch block handling BeanInstantiationExceptions.

Pull request: #25.
This commit is contained in:
Johannes Mockenhaupt
2013-02-26 18:39:41 +01:00
committed by Oliver Gierke
parent 9781f603ea
commit 596908946d
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/java/org/springframework/data/convert/ReflectionEntityInstantiatorUnitTests.java
View File

@@ -47,6 +47,7 @@ import org.springframework.util.ReflectionUtils.FieldCallback;
* Unit tests for {@link ReflectionEntityInstantiator}.
*
* @author Oliver Gierke
* @author Johannes Mockenhaupt
*/
@RunWith(MockitoJUnitRunner.class)
public class ReflectionEntityInstantiatorUnitTests<P extends PersistentProperty<P>> {
@@ -91,6 +92,19 @@ public class ReflectionEntityInstantiatorUnitTests<P extends PersistentProperty<
verify(provider, times(1)).getParameterValue((Parameter) constructor.getParameters().iterator().next());
}
/**
* @see DATACMNS-300
*/
@Test(expected = MappingInstantiationException.class)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void throwsExceptionOnBeanInstantiationException() {
when(entity.getPersistenceConstructor()).thenReturn(null);
when(entity.getType()).thenReturn((Class) PersistentEntity.class);
INSTANCE.createInstance(entity, provider);
}
/**
* @see DATACMNS-134
*/
@@ -134,8 +148,10 @@ public class ReflectionEntityInstantiatorUnitTests<P extends PersistentProperty<
List<Object> parameters = Arrays.asList((Object) "FOO", (Object) "FOO");
try {
INSTANCE.createInstance(entity, provider);
fail("Expected MappingInstantiationException!");
} catch (MappingInstantiationException o_O) {
assertThat(o_O.getConstructor(), is(constructor));
@@ -146,7 +162,6 @@ public class ReflectionEntityInstantiatorUnitTests<P extends PersistentProperty<
assertThat(o_O.getMessage(), containsString(Long.class.getName()));
assertThat(o_O.getMessage(), containsString(String.class.getName()));
assertThat(o_O.getMessage(), containsString("FOO"));
System.out.println(o_O.getMessage());
}
}