ICU 56 update step 1

source/test/intltest/apicoll.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 //===============================================================================
 //
 // File apicoll.cpp
 //
 //
 //
 // Created by: Helena Shih
 //
@@ skipping 170 matching lines @@
     col->setStrength(Collator::PRIMARY);
     logln("testing Collator::getStrength() method again ...");
     doAssert((col->getStrength() != Collator::TERTIARY), "collation object has the wrong strength");
     doAssert((col->getStrength() == Collator::PRIMARY), "collation object's strength is not primary difference");
 
     logln("testing French Collator::setStrength() method ...");
     col->setStrength(Collator::TERTIARY);
     doAssert((col->getStrength() == Collator::TERTIARY), "collation object's strength is not tertiary difference");
     doAssert((col->getStrength() != Collator::PRIMARY), "collation object's strength is primary difference");
     doAssert((col->getStrength() != Collator::SECONDARY), "collation object's strength is secondary difference");
+    delete col;
 
     logln("Create junk collation: ");
     Locale abcd("ab", "CD", "");
     success = U_ZERO_ERROR;
     Collator *junk = 0;
     junk = Collator::createInstance(abcd, success);
 
     if (U_FAILURE(success))
     {
         errln("Junk collation creation failed, should at least return default.");
-        delete col;
         return;
     }
 
-    delete col;
-    col = Collator::createInstance(success);
-    if (U_FAILURE(success))
-    {
-        errln("Creating default collator failed.");
-        delete junk;
-        return;
-    }
-
-    doAssert(((RuleBasedCollator *)col)->getRules() == ((RuleBasedCollator *)junk)->getRules(),
-               "The default collation should be returned.");
+    doAssert(((RuleBasedCollator *)junk)->getRules().isEmpty(),
+               "The root collation should be returned for an unsupported language.");
     Collator *frCol = Collator::createInstance(Locale::getCanadaFrench(), success);
     if (U_FAILURE(success))
     {
         errln("Creating fr_CA collator failed.");
-        delete col;
         delete junk;
         return;
     }
 
     // If the default locale isn't French, the French and non-French collators
     // should be different
     if (frCol->getLocale(ULOC_ACTUAL_LOCALE, success) != Locale::getCanadaFrench()) {
         doAssert((*frCol != *junk), "The junk is the same as the fr_CA collator.");
     }
     Collator *aFrCol = frCol->clone();
     doAssert((*frCol == *aFrCol), "The cloning of a fr_CA collator failed.");
     logln("Collator property test ended.");
 
-    delete col;
     delete frCol;
     delete aFrCol;
     delete junk;
 }
 
 void 
 CollationAPITest::TestRuleBasedColl()
 {
     RuleBasedCollator *col1, *col2, *col3, *col4;
     UErrorCode status = U_ZERO_ERROR;
@@ skipping 753 matching lines @@
 
 
 
     logln("The compare tests end.");
     delete col;
 }
 
 void
 CollationAPITest::TestGetAll(/* char* par */)
 {
-    if (logKnownIssue("10774","Side effects from utility/LocaleTest/TestGetLocale")) {
-        return;
-    }
     int32_t count1, count2;
     UErrorCode status = U_ZERO_ERROR;
 
     logln("Trying Collator::getAvailableLocales(int&)");
 
     const Locale* list = Collator::getAvailableLocales(count1);
     for (int32_t i = 0; i < count1; ++i) {
         UnicodeString dispName;
         logln(UnicodeString("Locale name: ")
             + UnicodeString(list[i].getName())
@@ skipping 520 matching lines @@
   vt[0] = 0x0041;
 
   (void)coll->setVariableTop(vt, 1, status);
   if(status != U_ILLEGAL_ARGUMENT_ERROR) {
     errln("setVariableTop(letter) did not detect illegal argument - %s", u_errorName(status));
   }
 
   status = U_ZERO_ERROR;
   vt[0] = 0x24;  // dollar sign (currency symbol)
   uint32_t newVarTop = coll->setVariableTop(vt, 1, status);
-
+  if(U_FAILURE(status)) {
+    errln("setVariableTop(dollar sign) failed: %s", u_errorName(status));
+    return;
+  }
   if(newVarTop != coll->getVariableTop(status)) {
     errln("setVariableTop(dollar sign) != following getVariableTop()");
   }
 
   UnicodeString dollar((UChar)0x24);
   UnicodeString euro((UChar)0x20AC);
   uint32_t newVarTop2 = coll->setVariableTop(euro, status);
   assertEquals("setVariableTop(Euro sign) == following getVariableTop()",
                (int64_t)newVarTop2, (int64_t)coll->getVariableTop(status));
   assertEquals("setVariableTop(Euro sign) == setVariableTop(dollar sign) (should pin to top of currency group)",
@@ skipping 135 matching lines @@
         errln("[Coll actual \"%s\"]: Error in actual locale, got different one: \"%s\"",
               locale.getName(), actual2.getName());
       }
       if(*coll2 != *coll) {
         errln("[Coll actual \"%s\"]: Got different collator than before", locale.getName());
       }
     }
     delete coll;
   }
 
-  /* completely non-existant locale for collator should get a default collator */
+  /* completely non-existent locale for collator should get a root collator */
   {
-    Collator *defaultColl = Collator::createInstance((const Locale)NULL, status);
-    coll = Collator::createInstance("blahaha", status);
+    LocalPointer<Collator> coll(Collator::createInstance("blahaha", status));
     if(U_FAILURE(status)) {
       errln("Failed to open collator with %s", u_errorName(status));
-      delete coll;
-      delete defaultColl;
       return;
     }
-    if(coll->getLocale(ULOC_VALID_LOCALE, status) !=
-      defaultColl->getLocale(ULOC_VALID_LOCALE, status)) {
-      errln("Valid locale for nonexisting locale locale collator differs "
-        "from valid locale for default collator");
+    Locale valid = coll->getLocale(ULOC_VALID_LOCALE, status);
+    const char *name = valid.getName();
+    if(*name != 0 && strcmp(name, "root") != 0) {
+      errln("Valid locale for nonexisting-locale collator is \"%s\" not root", name);
     }
-    if(coll->getLocale(ULOC_ACTUAL_LOCALE, status) !=
-      defaultColl->getLocale(ULOC_ACTUAL_LOCALE, status)) {
-      errln("Actual locale for nonexisting locale locale collator differs "
-        "from actual locale for default collator");
+    Locale actual = coll->getLocale(ULOC_ACTUAL_LOCALE, status);
+    name = actual.getName();
+    if(*name != 0 && strcmp(name, "root") != 0) {
+      errln("Actual locale for nonexisting-locale collator is \"%s\" not root", name);
     }
-    delete coll;
-    delete defaultColl;
   }
 
 
 
   /* collator instantiated from rules should have all three locales NULL */
   coll = new RuleBasedCollator(rlz, status);
   locale = coll->getLocale(ULOC_REQUESTED_LOCALE, status);
   if(U_SUCCESS(status) && !locale.isBogus()) {
     errln("For collator instantiated from rules, requested locale %s is not bogus", locale.getName());
   }
@@ skipping 763 matching lines @@
     TESTCASE_AUTO(TestSubclass);
     TESTCASE_AUTO(TestNULLCharTailoring);
     TESTCASE_AUTO(TestClone);
     TESTCASE_AUTO(TestCloneBinary);
     TESTCASE_AUTO(TestIterNumeric);
     TESTCASE_AUTO(TestBadKeywords);
     TESTCASE_AUTO_END;
 }
 
 #endif /* #if !UCONFIG_NO_COLLATION */