Update ICU to 54.1 step 1

source/test/intltest/ficoll.cpp

 /********************************************************************
- * Copyright (c) 1997-2009, International Business Machines
+ * Copyright (c) 1997-2009,2014, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************/
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_COLLATION
 
 #ifndef _COLL
 #include "unicode/coll.h"
 #endif
@@ skipping 22 matching lines @@
     UErrorCode status = U_ZERO_ERROR;
     myCollation = Collator::createInstance(Locale("fi", "FI", "", "collation=standard"),status);
 }
 
 CollationFinnishTest::~CollationFinnishTest()
 {
     delete myCollation;
 }
 
 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[] = {
     Collator::GREATER,
     Collator::LESS,
     Collator::GREATER,
     Collator::LESS,
     // test primary > 4
-    Collator::EQUAL,
+    Collator::GREATER,  // v < w per cldrbug 6615
 };
 
 void CollationFinnishTest::TestTertiary(/* char* par */)
 {
     int32_t i = 0;
     myCollation->setStrength(Collator::TERTIARY);
     for (i = 0; i < 4 ; i++) {
         doTest(myCollation, testSourceCases[i], testTargetCases[i], results[i]);
     }
 }
@@ skipping 16 matching lines @@
       return;
     }
     switch (index) {
         case 0: name = "TestPrimary";   if (exec)   TestPrimary(/* par */); break;
         case 1: name = "TestTertiary";  if (exec)   TestTertiary(/* par */); break;
         default: name = ""; break;
     }
 }
 
 #endif /* #if !UCONFIG_NO_COLLATION */