Modify tests for ISO 8601 timestamp input

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java

@@ -16,6 +16,7 @@
 import java.time.LocalTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.expression.function.FunctionProperties;
@@ -112,15 +113,21 @@ public void timeInUnsupportedFormat() {
   }
 
   @Test
-  public void timestampInUnsupportedFormat() {
-    Throwable exception =
-        assertThrows(
-            ExpressionEvaluationException.class,
-            () -> new ExprTimestampValue("2020-07-07T01:01:01Z"));
+  public void timestampInISO8601Format() {
+    ExprTimestampValue timestampValue = new ExprTimestampValue("2020-07-07T01:01:01Z");
     assertEquals(
-        "timestamp:2020-07-07T01:01:01Z in unsupported format, "
-            + "please use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
-        exception.getMessage());
+        LocalDateTime.parse("2020-07-07T01:01:01Z", DateTimeFormatter.ISO_DATE_TIME)
+            .toInstant(ZoneOffset.UTC),
+        timestampValue.timestampValue());
+  }
+
+  @Test
+  public void timestampInISO8601FormatWithTimeZone() {
+    ExprTimestampValue timestampValue = new ExprTimestampValue("2020-07-07T01:01:01-01:00");
+    assertEquals(
+        LocalDateTime.parse("2020-07-07T02:01:01Z", DateTimeFormatter.ISO_DATE_TIME)
+            .toInstant(ZoneOffset.UTC),
+        timestampValue.timestampValue());
   }
 
   @Test
@@ -134,13 +141,10 @@ public void stringTimestampValue() {
     assertEquals(LocalTime.parse("19:44:00"), stringValue.timeValue());
     assertEquals("\"2020-08-17 19:44:00\"", stringValue.toString());
 
-    Throwable exception =
-        assertThrows(
-            ExpressionEvaluationException.class,
-            () -> new ExprStringValue("2020-07-07T01:01:01Z").timestampValue());
+    ExprValue stringValueWithIsoTimestamp = new ExprStringValue("2020-07-07T01:01:01Z");
     assertEquals(
-        "date:2020-07-07T01:01:01Z in unsupported format, " + "please use 'yyyy-MM-dd'",
-        exception.getMessage());
+        LocalDateTime.parse("2020-07-07T01:01:01Z", DateTimeFormatter.ISO_DATE_TIME).toInstant(ZoneOffset.UTC),
+        stringValueWithIsoTimestamp.timestampValue());
   }
 
   @Test
@@ -221,7 +225,7 @@ public void timestampOverMaxNanoPrecision() {
             () -> new ExprTimestampValue("2020-07-07 01:01:01.1234567890"));
     assertEquals(
         "timestamp:2020-07-07 01:01:01.1234567890 in unsupported format, please use "
-            + "'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
+            + "'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]' or ISO 8601 format",
         exception.getMessage());
   }
 

core/src/test/java/org/opensearch/sql/expression/datetime/TimestampTest.java

@@ -64,7 +64,8 @@ public void timestamp_one_arg_string_invalid_format(String value, String testNam
             () -> DSL.timestamp(functionProperties, DSL.literal(value)).valueOf());
     assertEquals(
         String.format(
-            "timestamp:%s in unsupported format, please " + "use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]'",
+            "timestamp:%s in unsupported format, please "
+                + "use 'yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]' or ISO 8601 format",
             value),
         exception.getMessage());
   }