From 6d6a422db7950634ae5bfbc2153e27ae056adaff Mon Sep 17 00:00:00 2001 From: JCgH4164838Gh792C124B5 <43964333+JCgH4164838Gh792C124B5@users.noreply.github.com> Date: Sun, 19 Apr 2020 21:50:09 -0400 Subject: [PATCH] Initial fix for WW-5069: - Force US Locale for two tests that use date strings of the form MM/DD/CCYY. - When the tests/build are run in an environment with a non-US Locale and newer JDKs the tests may fail due to inability to parse the US date format. Note: Was noticed on Windows 10 with JDK11, but could affect other environments when run in a non-US Locale. --- .../opensymphony/xwork2/validator/DateRangeValidatorTest.java | 1 + .../opensymphony/xwork2/validator/VisitorFieldValidatorTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java index a8f64e958..98a5ed051 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java @@ -48,6 +48,7 @@ public class DateRangeValidatorTest extends XWorkTestCase { HashMap params = new HashMap<>(); params.put("date", date.getTime()); context.put(ActionContext.PARAMETERS, HttpParameters.create(params).build()); + context.put(ActionContext.LOCALE, Locale.US); // Force US Locale for date conversion tests on JDK9+ ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.VALIDATION_ACTION_NAME, null, context); proxy.execute(); diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java index cd66aca2f..c1f090444 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java @@ -38,6 +38,7 @@ public class VisitorFieldValidatorTest extends XWorkTestCase { public void setUp() throws Exception { super.setUp(); + ActionContext.getContext().put(ActionContext.LOCALE, Locale.US); // Force US Locale for date conversion tests on JDK9+ action = container.inject(VisitorValidatorTestAction.class); TestBean bean = action.getBean();