Merge branch 'unicode-org:main' into main

Author: sven-oly

executors/cpp/datetime_fmt.cpp

@@ -35,13 +35,10 @@ using std::string;
 
 auto StringToEStyle(string style_string) -> icu::DateFormat::EStyle {
   if (style_string == "full") { return icu::DateFormat::kFull;
-}
-  if (style_string == "long") { return icu::DateFormat::kLong;
-}
-  if (style_string == "medium") { return icu::DateFormat::kMedium;
-}
-  if (style_string == "short") { return icu::DateFormat::kShort;
-}
+  } else if (style_string == "long") { return icu::DateFormat::kLong;
+  } else if (style_string == "medium") { return icu::DateFormat::kMedium;
+  } else if (style_string == "short") { return icu::DateFormat::kShort;
+  }
   return icu::DateFormat::kNone;
 }
 
@@ -224,7 +221,7 @@ auto TestDatetimeFmt(json_object *json_in) -> string {
   // Use ISO string form of the date/time.
   json_object *input_string_obj =
       json_object_object_get(json_in, "input_string");
-  // Prefer ISO input as input.
+  // Use ISO input in milliseconds if available.
   json_object *input_millis = json_object_object_get(json_in, "input_millis");
 
   UDate test_date_time;
@@ -233,26 +230,10 @@ auto TestDatetimeFmt(json_object *json_in) -> string {
 
     string input_date_string = json_object_get_string(input_string_obj);
 
-    // SimpleDateFormat can't parse options or timezone offset
-    // First, remove options starting with "["
-    std::size_t pos = input_date_string.find("[");
-    if (pos >= 0) {
-      input_date_string = input_date_string.substr(0, pos);
-    }
-    // Now remove the explicit offset
-    pos = input_date_string.find("+");
-    if (pos >= 0) {
-      input_date_string = input_date_string.substr(0, pos);
-    }
-    pos = input_date_string.rfind("-");
-    if (pos >= 10) {
-      // DOn't clip in the date fields
-      input_date_string = input_date_string.substr(0, pos);
-    }
     UnicodeString date_ustring(input_date_string.c_str());
 
-    // TODO:  handles the offset +/-
-    SimpleDateFormat iso_date_fmt(u"y-M-d'T'h:m:sZ", und_locale, status);
+    // Input string is in 24 hour time!
+    SimpleDateFormat iso_date_fmt(u"y-M-d'T'H:m:sZ", und_locale, status);
     if (U_FAILURE(status) != 0) {
       string error_name = u_errorName(status);
       string error_message =

executors/node/datetime_fmt.js

@@ -45,8 +45,8 @@ const skeleton_to_options_map = new Map(
 
       ['h', {'hourCycle': 'h12', 'hour': 'numeric'} ],
       ['hh', {'hourCycle': 'h12', 'hour': '2-digit'} ],
-      ['H', {'hourCycle': 'h24', 'hour': 'numeric'} ],
-      ['HH', {'hourCycle': 'h24', 'hour': '2-digit'} ],
+      ['H', {'hourCycle': 'h23', 'hour': 'numeric'} ],
+      ['HH', {'hourCycle': 'h23', 'hour': '2-digit'} ],
 
       ['j', {'hour': 'numeric'} ],
       ['jj', {'hour': '2-digit'} ],
@@ -122,8 +122,10 @@ module.exports = {
       }
 
       test_options = fill_options_from_skeleton_parts(split);
-      if (debug > 0) {
-        console.log('# TEST_OPTIONS: %s', split, test_options);
+
+      // This may be specified explicitly in options.
+      if ('hourCycle' in input_options) {
+        test_options['hourCycle'] = input_options['hourCycle'];
       }
     }
 

testgen/generators/collation.py

@@ -59,9 +59,9 @@ def set_patterns(self):
         ]
 
         # For detecting and converting \x, \u, and \U coded values
-        self.xcoding = re.compile("\\\\x([0-9A-Fa-f]{2})")
-        self.escaped_ucoding = re.compile("\\\\u([0-9A-Fa-f]{4})")
-        self.escaped_bigU_coding = re.compile("\\\\U([0-9A-Fa-f]{8})")
+        self.xcoding = re.compile(r"\\x([0-9A-Fa-f]{2})")
+        self.escaped_ucoding = re.compile(r"\\u([0-9A-Fa-f]{4})")
+        self.escaped_bigU_coding = re.compile(r"\\U([0-9A-Fa-f]{8})")
 
     def process_test_data(self):
         # Get each kind of collation tests and create a unified data set

testgen/generators/number_fmt.py

@@ -5,7 +5,7 @@
 import re
 from generators.base import DataGenerator
 
-reblankline = re.compile("^\s*$")
+reblankline = re.compile(r"^\s*$")
 
 # Global constants
 # Values to be formatted in number format tests
@@ -166,7 +166,7 @@ def parseNumberFmtTestData(self, rawtestdata):
     # Source data: https://github.com/unicode-org/icu/blob/main/icu4c/source/test/testdata/dcfmtest.txt
     def generateDcmlFmtTestDataObjects(self, rawtestdata, count=0):
         original_count = count
-        recommentline = re.compile("^\s*#")
+        recommentline = re.compile(r"^\s*#")
         test_list = rawtestdata.splitlines()
 
         all_tests_list = []

testgen/generators/plurals.py

@@ -8,7 +8,7 @@
 
 from generators.base import DataGenerator
 
-reblankline = re.compile("^\s*$")
+reblankline = re.compile(r"^\s*$")
 
 class PluralGenerator(DataGenerator):
     def plurals_descriptor(self):

verifier/detail_template.html

@@ -21,7 +21,7 @@
         <!--Load the AJAX API for visualizing stacked bars-->
     <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
 
-<title>$test_type with $library_name</title>
+<title>$test_type $library_name</title>
   <style>
     body {   font-family: Sans-Serif; }