Backport test fix from develop.

Author: labkey-danield

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -16,12 +16,15 @@
 package org.labkey.test.tests.external.labModules;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.labkey.api.util.DateUtil;
 import org.labkey.remoteapi.CommandException;
 import org.labkey.remoteapi.Connection;
 import org.labkey.remoteapi.collections.CaseInsensitiveHashMap;
@@ -301,6 +304,9 @@ private void dateParseTest() throws ParseException
         String dateFormat3 = "MM/dd/yy";
         checkDate("02/20/11", dateFormat3);
         checkDate("3/5/99", dateFormat3);
+
+        String clientFormattedString = (String)executeScript("return Ext4.Date.format(LDK.ConvertUtils.parseDate('2024-01-01', 'c'), 'Y-m-d');");
+        assertEquals("Incorrect date parsing", clientFormattedString, "2024-01-01");
     }
 
     private void checkDate(String dateStr, String javaFormatStr) throws ParseException
@@ -1415,6 +1421,7 @@ private void samplesTableTest() throws Exception
             columnLabels.add(getColumnLabel(srr, name));
         }
 
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         List<List<String>> rows = new ArrayList<>();
         for (Map<String, Object> row : srr.getRows())
         {
@@ -1425,7 +1432,7 @@ private void samplesTableTest() throws Exception
                 String val = row.get(name) == null ? "" : String.valueOf(row.get(name));
                 if (name.toLowerCase().contains("date"))
                 {
-                    val = StringUtils.isEmpty(val) ? "" : ExcelHelper.getDateTimeFormat().format(new Date(val));
+                    val = StringUtils.isEmpty(val) ? "" : dateFormat.format(Date.parse(val));
                 }
 
                 target.add(val);
@@ -1440,10 +1447,10 @@ private void samplesTableTest() throws Exception
             List<List<String>> lines = ExcelHelper.getFirstNRows(sheet, 5);
 
             Assert.assertEquals(columnLabels, lines.get(0));
-            Assert.assertEquals(rows.get(0), lines.get(1));
-            Assert.assertEquals(rows.get(0), lines.get(2));
-            Assert.assertEquals(rows.get(1), lines.get(3));
-            Assert.assertEquals(rows.get(1), lines.get(4));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(0), lines.get(1));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(0), lines.get(2));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(1), lines.get(3));
+            Assert.assertEquals("Row did not match. ExcelHelper pattern: " + ExcelHelper.getDateTimeFormat().toPattern(), rows.get(1), lines.get(4));
         }
 
         refresh();