Fix #46 Make date comparison Locale independent

Signed-off-by: Mark Thomas <markt@apache.org>
jakartaee · Feb 12, 2019 · 5d63739 · 5d63739
1 parent 5400648
commit 5d63739
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/com/sun/ts/tests/servlet/api/javax_servlet_http/cookie/TestServlet.java b/src/com/sun/ts/tests/servlet/api/javax_servlet_http/cookie/TestServlet.java
@@ -71,6 +71,8 @@
 
 public class TestServlet extends HttpTCKServlet {
 
+  public static String CUSTOM_HEADER_DATE_FORMAT = "yyyy-MM-dd HH:mm";
+
   public void cloneTest(HttpServletRequest request,
       HttpServletResponse response) throws ServletException, IOException {
 
@@ -542,7 +544,8 @@ public void setMaxAgeVer0PositiveTest(HttpServletRequest request,
     testCookie.setVersion(0);
 
     testCookie.setMaxAge(2);
-    SimpleDateFormat sdf = new SimpleDateFormat();
+    // Use a custom format to ensure Locale independence
+    SimpleDateFormat sdf = new SimpleDateFormat(CUSTOM_HEADER_DATE_FORMAT);
     sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
     Date currDate = new Date();
     String dateString = sdf.format(currDate);

diff --git a/src/com/sun/ts/tests/servlet/api/javax_servlet_http/cookie/URLClient.java b/src/com/sun/ts/tests/servlet/api/javax_servlet_http/cookie/URLClient.java
@@ -352,7 +352,7 @@ public void setMaxAgePositiveTest() throws Fault {
     }
 
     // put expiry date into GMT
-    SimpleDateFormat sdf = new SimpleDateFormat();
+    SimpleDateFormat sdf = new SimpleDateFormat(TestServlet.CUSTOM_HEADER_DATE_FORMAT);
     sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
     String resultStringDate = sdf.format(expiryDate);
     try {

diff --git a/src/com/sun/ts/tests/servlet/pluggability/api/javax_servlet_http/cookie/URLClient.java b/src/com/sun/ts/tests/servlet/pluggability/api/javax_servlet_http/cookie/URLClient.java
@@ -23,6 +23,7 @@
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.common.webclient.http.HttpRequest;
 import com.sun.ts.tests.common.webclient.http.HttpResponse;
+import com.sun.ts.tests.servlet.api.javax_servlet_http.cookie.TestServlet;
 import com.sun.ts.tests.servlet.common.client.AbstractUrlClient;
 import com.sun.ts.tests.servlet.common.util.Data;
 import java.io.PrintWriter;
@@ -388,7 +389,7 @@ public void setMaxAgePositiveTest() throws Fault {
     }
 
     // put expiry date into GMT
-    SimpleDateFormat sdf = new SimpleDateFormat();
+    SimpleDateFormat sdf = new SimpleDateFormat(TestServlet.CUSTOM_HEADER_DATE_FORMAT);
     sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
     String resultStringDate = sdf.format(expiryDate);
     try {