root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix failing test

This commit is contained in:
Rossen Stoyanchev 2016-10-12 08:56:52 -04:00
parent 8a043ae9aa
commit bd69390c0f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
View File

@ -138,7 +138,14 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.springframework.web.servlet.support.RequestContextUtils; import org.springframework.web.servlet.support.RequestContextUtils;
import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.springframework.web.servlet.view.InternalResourceViewResolver;
import static org.junit.Assert.*; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/** /**
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
@ -2230,11 +2237,10 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
static class MyWebBindingInitializer implements WebBindingInitializer { static class MyWebBindingInitializer implements WebBindingInitializer {
@Override @Override
public void initBinder(WebDataBinder binder, WebRequest request) { public void initBinder(WebDataBinder binder) {
LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean(); LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean();
vf.afterPropertiesSet(); vf.afterPropertiesSet();
binder.setValidator(vf); binder.setValidator(vf);
assertNotNull(request.getLocale());
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
dateFormat.setLenient(false); dateFormat.setLenient(false);
binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false));