ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / ficoll.cpp

diff --git a/icuSources/test/intltest/ficoll.cpp b/icuSources/test/intltest/ficoll.cpp
index 128122d5ea22ff6773bcba64401560fdaa0980bf..bdea267b6de9f7ae5d8f5d7ce426e94c310685d7 100644 (file)
--- a/icuSources/test/intltest/ficoll.cpp
+++ b/icuSources/test/intltest/ficoll.cpp
@@ -1,7 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
- * COPYRIGHT: 
- * Copyright (c) 1997-2006, International Business Machines Corporation and
- * others. All Rights Reserved.
+ * Copyright (c) 1997-2009,2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
  ********************************************************************/
 
 #include "unicode/utypes.h"
@@ -34,7 +35,7 @@ CollationFinnishTest::CollationFinnishTest()
 : myCollation(0)
 {
     UErrorCode status = U_ZERO_ERROR;
-    myCollation = Collator::createInstance(Locale("fi", "FI", ""),status);
+    myCollation = Collator::createInstance(Locale("fi", "FI", "", "collation=standard"),status);
 }
 
 CollationFinnishTest::~CollationFinnishTest()
@@ -43,19 +44,19 @@ CollationFinnishTest::~CollationFinnishTest()
 }
 
 const UChar CollationFinnishTest::testSourceCases[][CollationFinnishTest::MAX_TOKEN_LEN] = {
-    {0x77, 0x61, 0x74, 0},
-    {0x76, 0x61, 0x74, 0},
+    {0x77, 0x61, 0x74, 0},  // "wat"
+    {0x76, 0x61, 0x74, 0},  // "vat"
     {0x61, 0x00FC, 0x62, 0x65, 0x63, 0x6b, 0},
     {0x4c, 0x00E5, 0x76, 0x69, 0},
-    {0x77, 0x61, 0x74, 0}
+    {0x77, 0x61, 0x74, 0}   // "wat"
 };
 
 const UChar CollationFinnishTest::testTargetCases[][CollationFinnishTest::MAX_TOKEN_LEN] = {
-    {0x76, 0x61, 0x74, 0},
+    {0x76, 0x61, 0x74, 0},  // "vat"
     {0x77, 0x61, 0x79, 0},
     {0x61, 0x78, 0x62, 0x65, 0x63, 0x6b, 0},
     {0x4c, 0x00E4, 0x77, 0x65, 0},
-    {0x76, 0x61, 0x74, 0}
+    {0x76, 0x61, 0x74, 0}   // "vat"
 };
 
 const Collator::EComparisonResult CollationFinnishTest::results[] = {
@@ -64,7 +65,7 @@ const Collator::EComparisonResult CollationFinnishTest::results[] = {
     Collator::GREATER,
     Collator::LESS,
     // test primary > 4
-    Collator::EQUAL,
+    Collator::GREATER,  // v < w per cldrbug 6615
 };
 
 void CollationFinnishTest::TestTertiary(/* char* par */)
@@ -89,7 +90,7 @@ void CollationFinnishTest::runIndexedTest( int32_t index, UBool exec, const char
     if (exec) logln("TestSuite CollationFinnishTest: ");
 
     if((!myCollation) && exec) {
-      errln(__FILE__ " cannot test - failed to create collator.");
+      dataerrln(__FILE__ " cannot test - failed to create collator.");
       name = "some test";
       return;
     }