Adding coll_nonignorable_short testing

executors/dart_web/bin/collator.dart

@@ -22,10 +22,20 @@ String testCollationShort(String jsonEncoded) {
     } else {
       coll = Intl();
     }
-    var d1 = json['string1'];
-    var d2 = json['string2'];
+    var d1 = json['s1'];
+    var d2 = json['s2'];
+
+    var should_ignore_punctuation = false;
+    try {
+      // Check the setting of this options
+      var ignorePunc = json['ignorePunctuation'];
+      should_ignore_punctuation = ignorePunc;
+    } catch (error) {
+      continue;
+    }
+
+    var collationOptions = CollationOptions(ignorePunctuation: should_ignore_punctuation);
 
-    var collationOptions = CollationOptions(ignorePunctuation: true);
     var compared = coll.collation(collationOptions).compare(d1, d2);
     var result = compared <= 0 ? true : false;
     outputLine = {'label': json['label'], "result": result};
@@ -38,7 +48,8 @@ String testCollationShort(String jsonEncoded) {
     outputLine = {
       'label': json['label'],
       'error_message': error.toString(),
-      'error': 'Collator compare failed'
+      'error': 'Collator compare failed',
+      's1': d1, 's2': d2
     };
   }
   return jsonEncode(outputLine);

executors/dart_web/out/executor.js

@@ -39,6 +39,7 @@ let doLogOutput = 0;
 // Test type support. Add new items as they are implemented
 const testTypes = {
   TestCollShiftShort: Symbol("coll_shift_short"),
+  TestCollationShort: Symbol("collation_short"),
   TestDecimalFormat: Symbol("decimal_fmt"),
   TestNumberFormat: Symbol("number_fmt"),
   TestDateTimeFormat: Symbol("datetime_fmtl"),
@@ -50,6 +51,7 @@ const testTypes = {
 
 const supported_test_types = [
   Symbol("coll_shift_short"),
+  Symbol("collation_short"),
   Symbol("decimal_fmt"),
   Symbol("number_fmt"),
   Symbol("display_names"),
@@ -59,6 +61,7 @@ const supported_tests_json = {
   "supported_tests":
     [
       "coll_shift_short",
+      "collation_short",
       "decimal_fmt",
       "number_fmt",
       "display_names",
@@ -87,6 +90,9 @@ function parseJsonForTestId(parsed) {
   if (testId == "coll_shift_short") {
     return testTypes.TestCollShiftShort;
   }
+  if (testId == "coll_shift_short") {
+    return testTypes.TestCollationShort;
+  }
   if (testId == "decimal_fmt" || testId == "number_fmt") {
     return testTypes.TestDecimalFormat;
   }
@@ -166,7 +172,7 @@ rl.on('line', function (line) {
         // testId = parseJsonForTestId(parsedJson);
         // Handle the string directly to  call the correct function.
         const test_type = parsedJson["test_type"];
-        if (test_type == "coll_shift_short") {
+        if (test_type == "collation_short") {
           outputLine = collator.testCollationShort(parsedJson);
         } else {
           outputLine = {

executors/node/collator.js

@@ -1,31 +1,38 @@
 // The Collator used for the actual testing.
 
-// !!! TODO: Collation: determine the sensitivity that corresponds
-// to the strength.
+// Collation: determine the sensitivity that corresponds to the strength.
 module.exports = {
 
-  testCollationShort: function(json) {
+  testCollationShort: function(json, shifted) {
+    // !!! TODO: remove shifted flag
 
     // Global default locale
-    let testLocale = '';
-    let testCollOptions = {ignorePunctuation:'true'};
+    let testLocale = undefined;
+    // TODO: set locale if provided in the test data.
+
+    let testCollOptions = {};
+    if ('ignorePunctuation' in json) {
+      testCollOptions = {
+        ignorePunctuation:json['ignorePunction']}
+    }
 
     // Set up collator object with optional locale and testOptions.
     let coll;
     try {
-      if (testLocale) {
-        coll = new Intl.Collator(testLocale, testCollOptions);
-      } else {
-        coll = new Intl.Collator(testCollOptions);
-      }
-      let d1 = json['string1'];
-      let d2 = json['string2'];
+      coll = new Intl.Collator(testLocale, testCollOptions);
 
+      let d1 = json['s1'];
+      let d2 = json['s2'];
+
+      // Should we check with < or <=?
       const compared = coll.compare(d1, d2);
       let result = compared<= 0 ? true : false;
-      let resultString = result ? true : false;
+      let result_bool = true;
+      if (compared > 0) {
+        result_bool = false;
+      }
       outputLine = {'label':json['label'],
-                    "result": result
+                    "result": result_bool,
                    }
 
       if (result != true) {

executors/node/executor.js

@@ -43,7 +43,9 @@ let doLogOutput = 0;
 
 // Test type support. Add new items as they are implemented
 const testTypes = {
+  TestCollationShort : Symbol("collation_short"),
   TestCollShiftShort : Symbol("coll_shift_short"),
+  TestCollNonignorableShort : Symbol("coll_nonignorable_short"),
   TestDecimalFormat : Symbol("decimal_fmt"),
   TestNumberFormat : Symbol("number_fmt"),
   TestDateTimeFormat : Symbol("datetime_fmtl"),
@@ -54,7 +56,9 @@ const testTypes = {
 }
 
 const supported_test_types = [
+  Symbol("collation_short"),
   Symbol("coll_shift_short"),
+  Symbol("coll_nonignorable_short"),
   Symbol("decimal_fmt"),
   Symbol("number_fmt"),
   Symbol("display_names"),
@@ -63,6 +67,7 @@ const supported_test_types = [
 const supported_tests_json = {"supported_tests":
                               [
                                 "coll_shift_short",
+                                "coll_nonignorable_short",
                                 "decimal_fmt",
                                 "number_fmt",
                                 "display_names",
@@ -90,6 +95,17 @@ function parseJsonForTestId(parsed) {
   if (testId == "coll_shift_short") {
     return testTypes.TestCollShiftShort;
   }
+  if (testId == "collation_short") {
+    return testTypes.TestCollationShort;
+  }
+  if (testId == "coll_shift_short") {
+    return testTypes.TestCollShiftShort;
+  }
+
+  if (testId == "coll_nonignorable_short"){
+    return testTypes.TestCollNonignorableShort;
+  }
+
   if (testId == "decimal_fmt" || testId == "number_fmt") {
     return testTypes.TestDecimalFormat;
   }
@@ -166,7 +182,7 @@ rl.on('line', function(line) {
     // testId = parseJsonForTestId(parsedJson);
     // Handle the string directly to  call the correct function.
     const test_type = parsedJson["test_type"];
-    if (test_type == "coll_shift_short") {
+    if (test_type == "collation_short") {
       outputLine = collator.testCollationShort(parsedJson);
     } else
     if (test_type == "decimal_fmt" || test_type == "number_fmt") {

executors/rust/src/collator.rs

@@ -12,16 +12,21 @@ use icu::locid::locale;
 pub fn run_collation_test(json_obj: &Value) -> Result<Value, String> {
     // TODO: Handle errors of missing values and failures.
     let label = &json_obj["label"].as_str().unwrap();
-    let str1: &str = json_obj["string1"].as_str().unwrap();
-    let str2: &str = json_obj["string2"].as_str().unwrap();
+    let ignore_punctuation : &Option<bool> = &json_obj["ignorePunctuation"].as_bool();
+    let str1: &str = json_obj["s1"].as_str().unwrap();
+    let str2: &str = json_obj["s2"].as_str().unwrap();
 
     let data_provider = icu_testdata::unstable();
 
     let mut options = CollatorOptions::new();
     options.strength = Some(Strength::Tertiary);
 
-    // Does this ignore punctuation?
-    //coll_options.set_alternate_handling(Some(AlternateHandling::Shifted));
+    // Ignore punctuation only if using shifted test.
+    if let Some(ip) = ignore_punctuation {
+        if *ip {
+            options.alternate_handling = Some(AlternateHandling::Shifted);
+        }
+    }
 
     let collator: Collator =
         Collator::try_new_unstable(&data_provider, &locale!("en").into(), options).unwrap();

executors/rust/src/main.rs

@@ -115,7 +115,7 @@ fn main() -> io::Result<()> {
             let label: &str = json_info["label"].as_str().unwrap();
 
             // TODO!!! : supported_test_map to call the functions.
-            let json_result = if test_type == "coll_shift_short" {
+            let json_result = if test_type == "collation_short" {
                 run_collation_test(&json_info)
             } else if (test_type == "decimal_fmt") || (test_type == "number_fmt") {
                 run_numberformat_test(&json_info)

generateDataAndRun.sh

@@ -63,42 +63,42 @@ source "$HOME/.nvm/nvm.sh"
 #Dart ICU73
 nvm install 20.1.0
 nvm use 20.1.0
-python3 testdriver.py --icu_version icu73 --exec dart_web --test_type coll_shift_short --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu73 --exec dart_web --test_type collation_short --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 #ICU73
 nvm install 20.1.0
 nvm use 20.1.0
-python3 testdriver.py --icu_version icu73 --exec node --test_type coll_shift_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu73 --exec node --test_type collation_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 #ICU72
 nvm install 18.14.2
 nvm use 18.14.2
-python3 testdriver.py  --icu_version icu72 --exec node --test_type coll_shift_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py  --icu_version icu72 --exec node --test_type collation_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 #ICU71
 nvm install 18.7.0
-python3 testdriver.py --icu_version icu71 --exec node --test_type coll_shift_short number_fmt --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu71 --exec node --test_type collation_short number_fmt --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 # ICU70
 nvm install 14.21.3
 nvm use 14.21.3
-python3 testdriver.py --icu_version icu70 --exec node --test_type coll_shift_short number_fmt --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu70 --exec node --test_type collation_short number_fmt  --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 # ICU69
 nvm install 14.18.3
 nvm use 14.18.3
-python3 testdriver.py --icu_version icu69 --exec node --test_type coll_shift_short number_fmt --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu69 --exec node --test_type collation_short number_fmt --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 # ICU4X testing
-python3 testdriver.py --icu_version icu71 --exec rust --test_type coll_shift_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu71 --exec rust --test_type collation_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
 
-python3 testdriver.py --icu_version icu73 --exec rust --test_type coll_shift_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
+python3 testdriver.py --icu_version icu73 --exec rust --test_type collation_short number_fmt lang_names --file_base ../$TEMP_DIR --per_execution 10000
 echo $?
 
 # Done with test execution
@@ -111,7 +111,7 @@ popd
 # Verify everything
 mkdir -p $TEMP_DIR/testReports
 pushd verifier
-python3 verifier.py --file_base ../$TEMP_DIR --exec rust node dart_web --test_type coll_shift_short number_fmt lang_names 
+python3 verifier.py --file_base ../$TEMP_DIR --exec rust node dart_web --test_type collation_short number_fmt lang_names 
 
 #python3 verifier.py --file_base ../$TEMP_DIR --exec dart_web --test_type coll_shift_short
 #python3 verifier.py --file_base ../$TEMP_DIR --exec cpp--test_type coll_shift_short number_fmt lang_names 

testdriver/datasets.py

@@ -87,7 +87,7 @@ def resolveCldr(text):
 
 # TODO: Can this be added to a configuration file?
 class testType(Enum):
-  coll_shift = 'coll_shift_short'
+  collation_short = 'collation_short'
   decimal_fmt = 'decimal_fmt'
   datetime_fmt = 'datetime_fmt'
   display_names = 'display_names'
@@ -101,16 +101,10 @@ def def_value():
 # Initialize dictionary of data organized by test type
 testDatasets = defaultdict(def_value)
 
-testName = 'coll_shift_short'
-testDatasets[testName] = DataSet(testType.coll_shift.value,
-                                 'coll_test_shift.json',
-                                 'coll_verify_shift.json',
-                                 CLDRVersion.CLDR41, ICUVersion.ICU71)
-
-testName = 'coll_shift_67'
-testDatasets[testName] = DataSet(testType.coll_shift.value,
-                                 'coll_test0816_U67.json',
-                                 None,
+testName = 'collation_short'
+testDatasets[testName] = DataSet(testType.collation_short.value,
+                                 'collation_test.json',
+                                 'collation_verify.json',
                                  CLDRVersion.CLDR41, ICUVersion.ICU71)
 
 testName = 'decimal_fmt'

testdriver/ddtargs.py

@@ -1,7 +1,7 @@
 # Process command line arguments for running DDT
 
 # Args expected with examples
-#  test_type: coll_shift, decimal_fmt, etc.
+#  test_type: collation_short, decimal_fmt, etc.
 #  exec: node, rust, cpp, java, custom
 #  cldr_version: 41
 #  icu_version: 71.1
@@ -31,7 +31,7 @@ def __init__(self):
     self.parallel_mode = None  # For each exec or using N CPUs?
     self.exec_mode = 'one_test'  # Default. 'multi_test
 
-type_options = ['coll_shift_short', 'decimal_fmt', 'display_names',
+type_options = ['collation_short', 'decimal_fmt', 'display_names',
                 'number_fmt', 'lang_names', 'ALL']
 
 class DdtArgs():
@@ -142,12 +142,12 @@ def setCommonArgs(parser):
 
 def argsTestData():
   tests = [
-      ['--test_type', 'coll_shift_short'],
-      ['--test_type', 'coll_shift_short', '-t', 'decimal_fmt'],
-      ['--test_type', 'coll_shift_short', '--test_type', 'decimal_fmt', 'number_fmt', 'display_names',
+      ['--test_type', 'collation_short'],
+      ['--test_type', 'collation_short', '-t', 'decimal_fmt'],
+      ['--test_type', 'collation_short', '--test_type', 'decimal_fmt', 'number_fmt', 'display_names',
        'lang_names'],
 
-      ['--test', 'coll_shift_short', 'ALL', 'decimal_fmt'],
+      ['--test', 'collation_short', 'ALL', 'decimal_fmt'],
 
       ['--test_type', 'ALL'],
       '--type ALL decimal_fmt --exec a b c d'.split(),