ICU 56 update step 1

source/test/cintltst/cldrtest.c

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
 #include "cintltst.h"
 #include "unicode/ures.h"
 #include "unicode/ucurr.h"
 #include "unicode/ustring.h"
 #include "unicode/uset.h"
 #include "unicode/udat.h"
 #include "unicode/uscript.h"
@@ skipping 459 matching lines @@
     if(strcmp(localeName, lcidStringC) != 0) {
         char langName[1024];
         char langLCID[1024];
         uloc_getLanguage(localeName, langName, sizeof(langName), &status);
         uloc_getLanguage(lcidStringC, langLCID, sizeof(langLCID), &status);
 
         if (strcmp(langName, langLCID) == 0) {
             log_verbose("WARNING: %-5s resolves to %s (0x%.4x)\n",
                 localeName, lcidStringC, expectedLCID);
         }
-        else if (strncmp(localeName, "hsb", 3) != 0 || !log_knownIssue("11216", "Duplicate LCID mapping for language hsb")) {
+        else {
             log_err("ERROR:   %-5s has 0x%.4x and the number resolves wrongfully to %s\n",
                 localeName, expectedLCID, lcidStringC);
         }
     }
 }
 
 #if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION
 static void
 TestLocaleStructure(void) {
     // This test checks the locale structure against a key file located
@@ skipping 487 matching lines @@
                 if (U_FAILURE(errorCode)) {
                     log_err("error ures_getByKey returned %s\n", u_errorName(errorCode));
                 }
                 if (getTestOption(QUICK_OPTION)) {
                     end = 1;
                 }
                 else {
                     end = ures_getSize(resArray);
                 }
 
+                if ((uprv_strncmp(currLoc,"lrc",3) == 0 || uprv_strncmp(currLoc,"mzn",3) == 0) && 
+                        log_knownIssue("cldrbug:8899", "lrc and mzn locales don't have translated day names")) {
+                    end = 0;
+                }
 
                 for (idx = 0; idx < end; idx++) {
                     const UChar *fromBundleStr = ures_getStringByIndex(resArray, idx, &langSize, &errorCode);
                     if (U_FAILURE(errorCode)) {
                         log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode));
                         continue;
                     }
                     strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, mergedExemplarSet, TRUE, &badChar);
-                    if (strIdx >= 0) {
+                    if ( strIdx >= 0 ) { 
                         log_err("getDayNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",
                             currLoc, idx, strIdx, badChar);
                     }
                 }
                 ures_close(resArray);
                 ures_close(format);
                 ures_close(names);
 
                 names = ures_getByKeyWithFallback(greg, "monthNames", NULL, &errorCode);
                 format = ures_getByKeyWithFallback(names,"format", NULL, &errorCode);
@@ skipping 68 matching lines @@
 
                errorCode = U_ZERO_ERROR;
                measurementSystem = ulocdata_getMeasurementSystem(currLoc, &errorCode);
                if (U_FAILURE(errorCode)) {
                    log_err("ulocdata_getMeasurementSystem failed for locale %s with error: %s \n", currLoc, u_errorName(errorCode));
                } else {
                    if ( strstr(fullLoc, "_US")!=NULL || strstr(fullLoc, "_MM")!=NULL || strstr(fullLoc, "_LR")!=NULL ) {
                        if(measurementSystem != UMS_US){
                             log_err("ulocdata_getMeasurementSystem did not return expected data for locale %s \n", currLoc);
                        }
+                   } else if ( strstr(fullLoc, "_GB")!=NULL ) {
+                       if(measurementSystem != UMS_UK){
+                            log_err("ulocdata_getMeasurementSystem did not return expected data for locale %s \n", currLoc);
+                       }
                    } else if (measurementSystem != UMS_SI) {
                        log_err("ulocdata_getMeasurementSystem did not return expected data for locale %s \n", currLoc);
                    }
                }
                
                errorCode = U_ZERO_ERROR;
                ulocdata_getPaperSize(currLoc, &height, &width, &errorCode);
                if (U_FAILURE(errorCode)) {
                    log_err("ulocdata_getPaperSize failed for locale %s with error: %s \n", currLoc, u_errorName(errorCode));
                } else {
@@ skipping 416 matching lines @@
 #endif
     TESTCASE(TestConsistentCountryInfo);
     TESTCASE(VerifyTranslation);
     TESTCASE(TestExemplarSet);
     TESTCASE(TestLocaleDisplayPattern);
     TESTCASE(TestCoverage);
     TESTCASE(TestIndexChars);
     TESTCASE(TestAvailableIsoCodes);
 }