ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / test / cintltst / cfintst.c

diff --git a/icuSources/test/cintltst/cfintst.c b/icuSources/test/cintltst/cfintst.c
index 4fa10b0dbf0548dc7b2682093ccc23cb14e74b28..b4d36a8e43b161bed05388d72023d634a189d87f 100644 (file)
--- a/icuSources/test/cintltst/cfintst.c
+++ b/icuSources/test/cintltst/cfintst.c
@@ -1,16 +1,16 @@
 /********************************************************************
- * COPYRIGHT: 
- * Copyright (c) 1997-2004, International Business Machines Corporation
- * and others. All Rights Reserved.
- ********************************************************************/
-/********************************************************************************
-*
-* File CFINTST.C
-*
-* Modification History:
-*        Name                     Description            
-*     Madhu Katragadda            Ported for C API
-*********************************************************************************/
+ * Copyright (c) 1997-2009,2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ ********************************************************************
+ *
+ * File CFINTST.C
+ *
+ * Modification History:
+ *        Name                     Description            
+ *     Madhu Katragadda            Ported for C API
+ ********************************************************************
+ */
+
 /**
  * CollationFinnishTest is a third level test class.  This tests the locale
  * specific primary, secondary and tertiary rules.  For example, the ignorable
@@ -56,7 +56,7 @@ const static UCollationResult results[] = {
     UCOL_GREATER,
     UCOL_LESS,
     /* test primary > 4*/
-    UCOL_EQUAL
+    UCOL_GREATER    /* v < w per cldrbug 6615 */
 };
 
 
@@ -65,8 +65,8 @@ void addFinnishCollTest(TestNode** root)
 {
     
     
-    addTest(root, &TestPrimary, "tscoll/cficoll/TestPrimary");
-    addTest(root, &TestTertiary, "tscoll/cficoll/TestTertiary");
+    addTest(root, &TestPrimary, "tscoll/cfintst/TestPrimary");
+    addTest(root, &TestTertiary, "tscoll/cfintst/TestTertiary");
     
 
 
@@ -78,9 +78,9 @@ static void TestTertiary( )
     
     int32_t i;
     UErrorCode status = U_ZERO_ERROR;
-    myCollation = ucol_open("fi_FI", &status);
+    myCollation = ucol_open("fi_FI@collation=standard", &status);
     if(U_FAILURE(status)){
-        log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
+        log_err_status(status, "ERROR: in creation of rule based collator: %s\n", myErrorName(status));
     }
     log_verbose("Testing Finnish Collation with Tertiary strength\n");
     ucol_setStrength(myCollation, UCOL_TERTIARY);
@@ -96,11 +96,11 @@ static void TestPrimary()
     
     int32_t i;
     UErrorCode status = U_ZERO_ERROR;
-    myCollation = ucol_open("fi_FI", &status);
+    myCollation = ucol_open("fi_FI@collation=standard", &status);
     if(U_FAILURE(status)){
-        log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
+        log_err_status(status, "ERROR: in creation of rule based collator: %s\n", myErrorName(status));
     }
-    log_verbose("Testing Finnish Collation with Tertiary strength\n");
+    log_verbose("Testing Finnish Collation with Primary strength\n");
     ucol_setStrength(myCollation, UCOL_PRIMARY);
     for (i = 4; i < 5; i++)
     {