GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Assertions for error codes in case of formatting failures 

Issue: SPR-14345
pull/1073/merge
Juergen Hoeller 10 years ago
parent
d1d29cf699
commit
c6f63bdb30
1 changed files with 6 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      spring-context/src/test/java/org/springframework/validation/DataBinderTests.java

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

@ -227,12 +227,14 @@ public class DataBinderTests {
assertTrue("Has age errors", br.hasFieldErrors("age")); assertTrue("Has age errors", br.hasFieldErrors("age"));
assertTrue("Correct number of age errors", br.getFieldErrorCount("age") == 1); assertTrue("Correct number of age errors", br.getFieldErrorCount("age") == 1);
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("age").getCode());
assertEquals("32x", binder.getBindingResult().getFieldValue("age")); assertEquals("32x", binder.getBindingResult().getFieldValue("age"));
assertEquals("32x", binder.getBindingResult().getFieldError("age").getRejectedValue()); assertEquals("32x", binder.getBindingResult().getFieldError("age").getRejectedValue());
assertEquals(0, tb.getAge()); assertEquals(0, tb.getAge());
assertTrue("Has touchy errors", br.hasFieldErrors("touchy")); assertTrue("Has touchy errors", br.hasFieldErrors("touchy"));
assertTrue("Correct number of touchy errors", br.getFieldErrorCount("touchy") == 1); assertTrue("Correct number of touchy errors", br.getFieldErrorCount("touchy") == 1);
assertEquals("methodInvocation", binder.getBindingResult().getFieldError("touchy").getCode());
assertEquals("m.y", binder.getBindingResult().getFieldValue("touchy")); assertEquals("m.y", binder.getBindingResult().getFieldValue("touchy"));
assertEquals("m.y", binder.getBindingResult().getFieldError("touchy").getRejectedValue()); assertEquals("m.y", binder.getBindingResult().getFieldError("touchy").getRejectedValue());
assertNull(tb.getTouchy()); assertNull(tb.getTouchy());
@ -316,12 +318,14 @@ public class DataBinderTests {
assertTrue("Has age errors", br.hasFieldErrors("age")); assertTrue("Has age errors", br.hasFieldErrors("age"));
assertTrue("Correct number of age errors", br.getFieldErrorCount("age") == 1); assertTrue("Correct number of age errors", br.getFieldErrorCount("age") == 1);
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("age").getCode());
assertEquals("32x", binder.getBindingResult().getFieldValue("age")); assertEquals("32x", binder.getBindingResult().getFieldValue("age"));
assertEquals("32x", binder.getBindingResult().getFieldError("age").getRejectedValue()); assertEquals("32x", binder.getBindingResult().getFieldError("age").getRejectedValue());
assertEquals(0, tb.getAge()); assertEquals(0, tb.getAge());
assertTrue("Has touchy errors", br.hasFieldErrors("touchy")); assertTrue("Has touchy errors", br.hasFieldErrors("touchy"));
assertTrue("Correct number of touchy errors", br.getFieldErrorCount("touchy") == 1); assertTrue("Correct number of touchy errors", br.getFieldErrorCount("touchy") == 1);
assertEquals("methodInvocation", binder.getBindingResult().getFieldError("touchy").getCode());
assertEquals("m.y", binder.getBindingResult().getFieldValue("touchy")); assertEquals("m.y", binder.getBindingResult().getFieldValue("touchy"));
assertEquals("m.y", binder.getBindingResult().getFieldError("touchy").getRejectedValue()); assertEquals("m.y", binder.getBindingResult().getFieldError("touchy").getRejectedValue());
assertNull(tb.getTouchy()); assertNull(tb.getTouchy());
@ -420,6 +424,7 @@ public class DataBinderTests {
binder.bind(pvs); binder.bind(pvs);
assertTrue(binder.getBindingResult().hasFieldErrors("name")); assertTrue(binder.getBindingResult().hasFieldErrors("name"));
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("name").getCode());
assertEquals("test", binder.getBindingResult().getFieldValue("name")); assertEquals("test", binder.getBindingResult().getFieldValue("name"));
} }
@ -568,6 +573,7 @@ public class DataBinderTests {
assertEquals(new Float(0.0), tb.getMyFloat()); assertEquals(new Float(0.0), tb.getMyFloat());
assertEquals("1x2", binder.getBindingResult().getFieldValue("myFloat")); assertEquals("1x2", binder.getBindingResult().getFieldValue("myFloat"));
assertTrue(binder.getBindingResult().hasFieldErrors("myFloat")); assertTrue(binder.getBindingResult().hasFieldErrors("myFloat"));
assertEquals("typeMismatch", binder.getBindingResult().getFieldError("myFloat").getCode());
} }
finally { finally {
LocaleContextHolder.resetLocaleContext(); LocaleContextHolder.resetLocaleContext();
@ -882,7 +888,6 @@ public class DataBinderTests {
public void setAsText(String text) throws IllegalArgumentException { public void setAsText(String text) throws IllegalArgumentException {
setValue(new Integer(99)); setValue(new Integer(99));
} }
@Override @Override
public String getAsText() { public String getAsText() {
return "argh"; return "argh";
@ -907,7 +912,6 @@ public class DataBinderTests {
public void setAsText(String text) throws IllegalArgumentException { public void setAsText(String text) throws IllegalArgumentException {
setValue("prefix" + text); setValue("prefix" + text);
} }
@Override @Override
public String getAsText() { public String getAsText() {
return ((String) getValue()).substring(6); return ((String) getValue()).substring(6);
@ -980,7 +984,6 @@ public class DataBinderTests {
public Integer parse(String text, Locale locale) throws ParseException { public Integer parse(String text, Locale locale) throws ParseException {
return 99; return 99;
} }
@Override @Override
public String print(Integer object, Locale locale) { public String print(Integer object, Locale locale) {
return "argh"; return "argh";

Write Preview
Loading…
Cancel
Save