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

Consistent processing of empty values and catching of RuntimeExceptions for Formatters

Browse Source 
Issue: SPR-14345
(cherry picked from commit d51c22a)
This commit is contained in:
Juergen Hoeller
2016-06-09 10:49:15 +02:00
parent 367e663730
commit f9e8924b3d
8 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
View File

@@ -402,11 +402,12 @@ public class DataBinderTests {
}
@Test
public void testBindingErrorWithStringFormatter() {
public void testBindingErrorWithParseExceptionFromFormatter() {
TestBean tb = new TestBean();
DataBinder binder = new DataBinder(tb);
FormattingConversionService conversionService = new FormattingConversionService();
DefaultConversionService.addDefaultConverters(conversionService);
conversionService.addFormatter(new Formatter<String>() {
@Override
public String parse(String text, Locale locale) throws ParseException {
@@ -417,6 +418,35 @@ public class DataBinderTests {
return object;
}
});
binder.setConversionService(conversionService);
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("name", "test");
binder.bind(pvs);
assertTrue(binder.getBindingResult().hasFieldErrors("name"));
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("name").getCode());
assertEquals("test", binder.getBindingResult().getFieldValue("name"));
}
@Test
public void testBindingErrorWithRuntimeExceptionFromFormatter() {
TestBean tb = new TestBean();
DataBinder binder = new DataBinder(tb);
FormattingConversionService conversionService = new FormattingConversionService();
DefaultConversionService.addDefaultConverters(conversionService);
conversionService.addFormatter(new Formatter<String>() {
@Override
public String parse(String text, Locale locale) throws ParseException {
throw new RuntimeException(text);
}
@Override
public String print(String object, Locale locale) {
return object;
}
});
binder.setConversionService(conversionService);
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("name", "test");
@@ -580,9 +610,10 @@ public class DataBinderTests {
}
@Test
public void testBindingErrorWithCustomStringFormatter() {
public void testBindingErrorWithParseExceptionFromCustomFormatter() {
TestBean tb = new TestBean();
DataBinder binder = new DataBinder(tb);
binder.addCustomFormatter(new Formatter<String>() {
@Override
public String parse(String text, Locale locale) throws ParseException {
@@ -593,12 +624,39 @@ public class DataBinderTests {
return object;
}
});
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("name", "test");
binder.bind(pvs);
assertTrue(binder.getBindingResult().hasFieldErrors("name"));
assertEquals("test", binder.getBindingResult().getFieldValue("name"));
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("name").getCode());
}
@Test
public void testBindingErrorWithRuntimeExceptionFromCustomFormatter() {
TestBean tb = new TestBean();
DataBinder binder = new DataBinder(tb);
binder.addCustomFormatter(new Formatter<String>() {
@Override
public String parse(String text, Locale locale) throws ParseException {
throw new RuntimeException(text);
}
@Override
public String print(String object, Locale locale) {
return object;
}
});
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("name", "test");
binder.bind(pvs);
assertTrue(binder.getBindingResult().hasFieldErrors("name"));
assertEquals("test", binder.getBindingResult().getFieldValue("name"));
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("name").getCode());
}
@Test
@@ -990,7 +1048,7 @@ public class DataBinderTests {
}, "age");
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("age", "");
pvs.add("age", "x");
binder.bind(pvs);
assertEquals("argh", binder.getBindingResult().getFieldValue("age"));