From d59aac13f2d97ea29c5195227a2c53ed507190f4 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Wed, 9 Jan 2013 22:35:08 +0000 Subject: [PATCH] WW-2923 adds support to be Locale independent git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1431122 13f79535-47bb-0310-9956-ffa450edef68 --- .../DateRangeFieldValidatorTest.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java index 25c8eb3e3..2222fdba2 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java @@ -8,9 +8,12 @@ import com.opensymphony.xwork2.validator.ValidatorContext; import java.util.Calendar; import java.util.Date; +import java.util.Locale; public class DateRangeFieldValidatorTest extends XWorkTestCase { + private Locale copy; + public void testPassValidation() throws Exception { // given ValidationAction action = prepareAction(createDate(2013, 6, 6)); @@ -35,7 +38,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase { // then assertTrue(context.getFieldErrors().size() == 1); - assertEquals("Max is 12/12/13, min is 1/1/13 but value is 3/3/12", context.getFieldErrors().get("dateRange").get(0)); + assertEquals("Max is 12.12.13, min is 01.01.13 but value is 03.03.12", context.getFieldErrors().get("dateRange").get(0)); } public void testMaxValidation() throws Exception { @@ -49,7 +52,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase { // then assertTrue(context.getFieldErrors().size() == 1); - assertEquals("Max is 12/12/13, min is 1/1/13 but value is 4/4/14", context.getFieldErrors().get("dateRange").get(0)); + assertEquals("Max is 12.12.13, min is 01.01.13 but value is 04.04.14", context.getFieldErrors().get("dateRange").get(0)); } private ValidationAction prepareAction(Date range) { @@ -83,4 +86,17 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase { return validator; } + @Override + public void setUp() throws Exception { + super.setUp(); + copy = Locale.getDefault(); + Locale.setDefault(new Locale("DE")); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + Locale.setDefault(copy); + } + }