ICU4J collation: use strength correctly. Apply "backwards" as locale "fr-CA" (#483)

Author: sven-oly

executors/icu4j/74/executor-icu4j/src/main/java/org/unicode/conformance/testtype/collator/CollatorInputJson.java

@@ -18,6 +18,8 @@ public class CollatorInputJson implements ITestTypeInputJson {
 
   public Integer line;
 
+  public String strength;
+
  public String compare_type;
 
  public String test_description;
@@ -26,6 +28,12 @@ public class CollatorInputJson implements ITestTypeInputJson {
 
  public String rules;
 
+ public String reorder;
+
+ public String case_first;
+
+ public String backwards;
+
  public String compare_comment;
 
  public String warning;

executors/icu4j/74/executor-icu4j/src/main/java/org/unicode/conformance/testtype/collator/CollatorTester.java

@@ -39,6 +39,7 @@ public ITestTypeInputJson inputMapToJson(Map<String, Object> inputMapData) {
     }
 
     result.locale = (String) inputMapData.get("locale", null);
+    result.strength = (String) inputMapData.get("strength", null);
 
     result.ignorePunctuation = (boolean) inputMapData.get("ignorePunctuation", false);
     result.line = (int) ((double) inputMapData.get("line", 0.0));
@@ -68,6 +69,8 @@ public ITestTypeInputJson inputMapToJson(Map<String, Object> inputMapData) {
     result.compare_comment = (String) inputMapData.get("compare_comment", null);
     result.warning = (String) inputMapData.get("warning", null);
 
+    result.backwards = (String) inputMapData.get("backwards", null);
+
     return result;
   }
 
@@ -98,20 +101,20 @@ public ITestTypeOutputJson execute(ITestTypeInputJson inputJson) {
     }
 
     // Use the compare_type field to set the strength of collation test.
-    if (input.compare_type != null){
-      if (input.compare_type.equals("=")) {
+    if (input.strength != null) {
+      if (input.strength.equals("identical")) {
         coll.setStrength(Collator.IDENTICAL);
       } else
-      if (input.compare_type.equals("<1")) {
+      if (input.strength.equals("primary")) {
         coll.setStrength(Collator.PRIMARY);
       } else
-      if (input.compare_type.equals("<2")) {
+      if (input.strength.equals("secondary")) {
         coll.setStrength(Collator.SECONDARY);
       } else
-      if (input.compare_type.equals("<3")) {
+      if (input.strength.equals("tertiary")) {
         coll.setStrength(Collator.TERTIARY);
       } else
-      if (input.compare_type.equals("<4")) {
+      if (input.strength.equals("quaternary")) {
         coll.setStrength(Collator.QUATERNARY);
       }
     }
@@ -166,7 +169,13 @@ public String formatOutputJson(ITestTypeOutputJson outputJson) {
   public Collator getCollatorForInput(CollatorInputJson input) {
     RuleBasedCollator result = null;
 
+    // Special case: Reset the locale to fr-CA in special case of backwards diacritics
+    if (input.backwards != null && input.backwards.equals("on")) {
+      input.locale = "fr-CA";
+    }
+
     if (input.locale == null || input.locale == "root") {
+      // Review this logic
       if (input.rules == null) {
         result = (RuleBasedCollator) Collator.getInstance(ULocale.ROOT);
       } else {

executors/icu4j/74/executor-icu4j/src/test/java/org/unicode/conformance/collator/icu74/CollatorTest.java

@@ -110,4 +110,13 @@ public void test00002() {
 
     assertTrue(output.result);
   }
+
+  @Test
+  public void testBackwards() {
+    String testInput = "{\"test_type\": \"collation\", \"strength\": \"secondary\", \"compare_type\":\"<2\",\"s1\":\"côte\",\"s2\":\"coté\",\"source_file\":\"collationtest.txt\",\"line\":347,\"label\":\"00153\",\"locale\":\"fr-CA\",\"test_description\":\"côté with backwards secondary\",\"backwards\":\"on\",\"hexhash\":\"0054321a336610ec2eabc4e824736e7e886bab4d\"}";
+    CollatorOutputJson output =
+        (CollatorOutputJson) CollatorTester.INSTANCE.getStructuredOutputFromInputStr(testInput);
+
+    assertTrue(output.result);
+  }
 }