Update ICU to 54.1 step 1

source/test/intltest/g7coll.cpp

 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2010, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_COLLATION
 
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
 #include "unicode/unistr.h"
 #include "unicode/sortkey.h"
 #include "g7coll.h"
 #include "sfwdchit.h"
-
+#include "cmemory.h"
 
 static const UChar testCases[][G7CollationTest::MAX_TOKEN_LEN] = {
     {  0x0062 /*'b'*/, 0x006c /*'l'*/, 0x0061 /*'a'*/, 0x0062 /*'c'*/, 0x006b /*'k'*/, 
         0x0062 /*'b'*/, 0x0069 /*'i'*/, 0x0072 /*'r'*/, 0x0064 /*'d'*/, 0x0073 /*'s'*/, 0x0000},                    /* 9 */
     { 0x0050 /*'P'*/, 0x0061 /*'a'*/, 0x0074/*'t'*/, 0x0000},                                                    /* 1 */
     { 0x0070 /*'p'*/, 0x00E9, 0x0063 /*'c'*/, 0x0068 /*'h'*/, 0x00E9, 0x0000},                                    /* 2 */
     { 0x0070 /*'p'*/, 0x00EA, 0x0063 /*'c'*/, 0x0068 /*'h'*/, 0x0065 /*'e'*/, 0x0000},                           /* 3 */
     { 0x0070 /*'p'*/, 0x00E9, 0x0063 /*'c'*/, 0x0068 /*'h'*/, 0x0065 /*'e'*/, 0x0072 /*'r'*/, 0x0000},            /* 4 */
     { 0x0070 /*'p'*/, 0x00EA, 0x0063 /*'c'*/, 0x0068 /*'h'*/, 0x0065 /*'e'*/, 0x0072 /*'r'*/, 0x0000},            /* 5 */
     { 0x0054 /*'T'*/, 0x006f /*'o'*/, 0x0064 /*'d'*/, 0x0000},                                                    /* 6 */
@@ skipping 56 matching lines @@
         Locale("en", "US", ""),
         Locale("en", "GB", ""),
         Locale("en", "CA", ""),
         Locale("fr", "FR", ""),
         Locale("fr", "CA", ""),
         Locale("de", "DE", ""),
         Locale("it", "IT", ""),
         Locale("ja", "JP", "")
     };
 
-
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < UPRV_LENGTHOF(locales); i++)
     {
-        Collator *myCollation= 0;
         UnicodeString dispName;
         UErrorCode status = U_ZERO_ERROR;
-        RuleBasedCollator* tblColl1 = 0;
 
-        myCollation = Collator::createInstance(locales[i], status);
+        const Locale &locale = locales[i];
+        LocalPointer<Collator> myCollation(Collator::createInstance(locale, status));
         if(U_FAILURE(status)) {
-          delete myCollation;
           errcheckln(status, "Couldn't instantiate collator. Error: %s", u_errorName(status));
           return;
         }
         myCollation->setStrength(Collator::QUATERNARY);
         myCollation->setAttribute(UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED, status);
-        if (U_FAILURE(status))
-        {
-            UnicodeString msg;
-
-            msg += "Locale ";
-            msg += locales[i].getDisplayName(dispName);
-            msg += "creation failed.";
-
-            errln(msg);
+        if (U_FAILURE(status)) {
+            errln("Locale %s creation failed - %s", locale.getName(), u_errorName(status));
             continue;
         }
 
-//        const UnicodeString& defRules = ((RuleBasedCollator*)myCollation)->getRules();
-        status = U_ZERO_ERROR;
-        tblColl1 = new RuleBasedCollator(((RuleBasedCollator*)myCollation)->getRules(), status);
-        if (U_FAILURE(status))
-        {
-            UnicodeString msg, name;
-
-            msg += "Recreate ";
-            msg += locales[i].getDisplayName(name);
-            msg += "collation failed.";
-
-            errln(msg);
-            continue;
+        const UnicodeString &rules = ((RuleBasedCollator*)myCollation.getAlias())->getRules();
+        if (rules.isEmpty() &&
+                (locale == Locale::getCanadaFrench() || locale == Locale::getJapanese())) {
+            dataerrln("%s Collator missing rule string", locale.getName());
+            if (logKnownIssue("10671", "TestG7Locales does not test ignore-punctuation")) {
+                continue;
+            }
+        } else {
+            status = U_ZERO_ERROR;
+            RuleBasedCollator *tblColl1 = new RuleBasedCollator(rules, status);
+            if (U_FAILURE(status)) {
+                errln("Recreate %s collation failed - %s", locale.getName(), u_errorName(status));
+                continue;
+            }
+            myCollation.adoptInstead(tblColl1);
         }
 
         UnicodeString msg;
 
         msg += "Locale ";
         msg += locales[i].getDisplayName(dispName);
         msg += "tests start :";
         logln(msg);
 
         int32_t j, n;
         for (j = 0; j < FIXEDTESTSET; j++)
         {
             for (n = j+1; n < FIXEDTESTSET; n++)
             {
-                doTest(tblColl1, testCases[results[i][j]], testCases[results[i][n]], Collator::LESS);
+                doTest(myCollation.getAlias(), testCases[results[i][j]], testCases[results[i][n]], Collator::LESS);
             }
         }
-
-        delete myCollation;
-        delete tblColl1;
     }
 }
 
 void G7CollationTest::TestDemo1(/* char* par */)
 {
     logln("Demo Test 1 : Create a new table collation with rules \"& Z < p, P\"");
     UErrorCode status = U_ZERO_ERROR;
     Collator *col = Collator::createInstance("en_US", status);
     if(U_FAILURE(status)) {
       delete col;
@@ skipping 128 matching lines @@
         case 0: name = "TestG7Locales"; if (exec)   TestG7Locales(/* par */); break;
         case 1: name = "TestDemo1"; if (exec)   TestDemo1(/* par */); break;
         case 2: name = "TestDemo2"; if (exec)   TestDemo2(/* par */); break;
         case 3: name = "TestDemo3"; if (exec)   TestDemo3(/* par */); break;
         case 4: name = "TestDemo4"; if (exec)   TestDemo4(/* par */); break;
         default: name = ""; break;
     }
 }
 
 #endif /* #if !UCONFIG_NO_COLLATION */