Mark "standard" datetime format type as "unsupported". Classify more … (#515)

* Mark "standard" datetime format type as "unsupported". Classify more things as "known issues"

* Fix some warnings

* Update message for unsupported dateTimeFormatType

Author: Craig Cornelius

executors/icu4j/74/executor-icu4j/src/main/java/org/unicode/conformance/testtype/datetimeformatter/DateTimeFormatterInputJson.java

@@ -31,6 +31,8 @@ public class DateTimeFormatterInputJson implements ITestTypeInputJson {
 
   public DateTimeFormatterTimeStyle timeStyle;
 
+  public String dateTimeFormatType;
+
   // TODO!!!
   public String calendar_string;
   // Set calendar from calendar_string!

executors/icu4j/74/executor-icu4j/src/main/java/org/unicode/conformance/testtype/datetimeformatter/DateTimeFormatterOutputJson.java

@@ -11,6 +11,9 @@ public class DateTimeFormatterOutputJson implements ITestTypeOutputJson {
   public String result;
 
   public String error;
+  public String error_type;
+  public String error_detail;
+  public String unsupported;
 
   public String error_message;
 }

executors/icu4j/74/executor-icu4j/src/main/java/org/unicode/conformance/testtype/datetimeformatter/DateTimeFormatterTester.java

@@ -61,6 +61,8 @@ public ITestTypeInputJson inputMapToJson(Map<String, Object> inputMapData) {
 
     result.calendar_string = (String) inputOptions.get("calendar");
 
+    result.dateTimeFormatType = (String) inputOptions.get("dateTimeFormatType");
+
     result.locale_with_calendar = new Builder().setLanguageTag(result.locale_string)
         .setUnicodeLocaleKeyword("ca", result.calendar_string)
         .build();
@@ -87,6 +89,14 @@ public ITestTypeOutputJson execute(ITestTypeInputJson inputJson) {
       return output;
     }
 
+    if (input.dateTimeFormatType != null && input.dateTimeFormatType.equals("standard")) {
+      output.error_message = input.dateTimeFormatType;
+      output.error_detail = "not atTime";
+      output.error_type = "unsupported";
+      output.unsupported = "format type";
+      return output;
+    }
+
     // If we get here, it's a pass/fail result (supported options and no runtime errors/exceptions)
     return output;
   }

executors/icu4j/74/executor-icu4j/src/test/java/org/unicode/conformance/datetimeformatter/DateTimeFormatterTest.java

@@ -147,4 +147,15 @@ public void testDate217() {
 
     assertEquals("3/6/2567 BE, 4:00 PM", output.result);
   }
+
+  @Test
+  public void testDateTimeFormatType() {
+    String testInput = "{\"test_type\": \"datetime_fmt\", \"label\":\"00000\",\"locale\":\"en-US\",\"input_string\":\"2024-03-17T00:00:00Z\",\"options\":{\"timeZone\":\"America/Los_Angeles\",\"dateStyle\":\"short\",\"timeStyle\":\"short\",\"dateTimeFormatType\":\"standard\",\"calendar\":\"gregory\"},\"tz_offset_secs\":-25200,\"original_input\":\"2024-03-16T17:00-07:00[America/Los_Angeles]\",\"hexhash\":\"4411425489f619054642a18e13b68490544728cb\"}";
+
+    DateTimeFormatterOutputJson output =
+        (DateTimeFormatterOutputJson) DateTimeFormatterTester.INSTANCE.getStructuredOutputFromInputStr(
+            testInput);
+
+    assertEquals("format type", output.unsupported);
+  }
 }

executors/node/datetime_fmt.js

@@ -169,6 +169,15 @@ module.exports = {
       test_options['dateStyle'] = input_options['dateStyle'];
     }
 
+    if ('dateTimeFormatType' in input_options &&
+        input_options['dateTimeFormatType'] == 'standard') {
+      return_json['error_type'] = 'unsupported';
+      return_json['error_detail'] = 'dateTimeFormatType: ' +
+          input_options['dateTimeFormatType'];
+        return_json['unsupported'] = 'format type';
+        return return_json;
+    }
+
     if ('semanticSkeleton' in input_options) {
       // Check for known issue when format output should give only the time zone.
       if (input_options['semanticSkeleton'] == 'Z') {

verifier/check_known_issues.py

@@ -58,6 +58,7 @@ class knownIssueType(Enum):
     datetime_fmt_at_inserted = 'Alternate formatting with "at" between time and date'
     datetime_fmt_arabic_comma = 'Arabic comma vs. ASCII comma'
     datetime_unexpected_comma = 'Unexpected comma'
+    datetime_inserted_comma = 'inserted comma'
 
     datetime_semantic_Z = 'NodeJS always includes date or time'
 
@@ -109,7 +110,7 @@ def diff_ascii_space_vs_nbsp(actual, expected_value):
 
     # If replacing all the NBSP characdters in expected gives the actual result,
     # then the only differences were with this type of space in formatted output.
-    if expected_value.replace(SP, NBSP) == actual:
+    if expected_value.replace(NBSP, SP) == actual:
         return knownIssueType.known_issue_sp_nbsp
     else:
         return None
@@ -169,13 +170,19 @@ def dt_check_for_alternate_long_form(test, actual, expected):
         return None
     if actual.replace(' at', ',') == expected:
         return knownIssueType.datetime_fmt_at_inserted
+
     # Thai language difference with "time" inserted
-    if actual.replace(' เวลา', '') == expected:
+    if actual.replace('เวลา ', '') == expected:
         return knownIssueType.datetime_fmt_at_inserted
     # Arabic
     if actual.replace(' في', '،') == expected:
         return knownIssueType.datetime_fmt_at_inserted
-
+    # Vietnamese
+    if actual.replace('lúc ', '') == expected:
+        return knownIssueType.datetime_fmt_at_inserted
+    # Bengali
+    if actual.replace('এ ', '') == expected:
+        return knownIssueType.datetime_fmt_at_inserted
     return None
 
 
@@ -185,19 +192,35 @@ def dt_check_arabic_comma(test, actual, expected):
     return None
 
 
-def dt_unexpected_comma(test, actual,  expected):
+def dt_unexpected_comma(test, actual, expected):
     if actual.replace('\u002c', '') == expected:
         return knownIssueType.datetime_unexpected_comma
     else:
         return None
 
+def dt_inserted_comma(test, actual, expected):
+    sm = SequenceMatcher(None, expected, actual)
+    sm_opcodes = sm.get_opcodes()
+    # Look for one additional comma
+    for opcode in sm_opcodes:
+        if opcode[0] == 'insert':
+            j1 = opcode[3]
+            j2 = opcode[4]
+            if actual[j1:j2] == ',':
+                return knownIssueType.datetime_inserted_comma
+    return None
+
 
 def check_datetime_known_issues(test):
     # Examine a single test for date/time isses
     # Returns known issues identified for this test in this category
     remove_this_one = False
     try:
-        result = test['result']
+        try:
+            result = test['result']
+        except KeyError as error:
+            # This lack of a result may be expected.
+            return False
         expected = test['expected']
         input_data = test.get('input_data')
 
@@ -233,10 +256,9 @@ def check_datetime_known_issues(test):
             test['known_issue_id'] = is_ki.value
             remove_this_one = True
 
-        # Check if the semantic skeleton has "Z"
-        if input_data and 'semanticSkeleton' in input_data['options'] and \
-                input_data['options']['semanticSkeleton'] == 'Z':
-            test['known_issud_id'] = knownIssueType.datetime_semantic_Z.value
+        is_ki = dt_inserted_comma(test, result, expected)
+        if is_ki:
+            test['known_issue_id'] = is_ki.value
             remove_this_one = True
 
     except BaseException as err: