X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/46f4442e9a5a4f3b98b7c1083586332f6a8a99a4..1a147d096ae81f4c8262f7bfc56bd19fc2dee932:/icuSources/test/cintltst/creststn.c

diff --git a/icuSources/test/cintltst/creststn.c b/icuSources/test/cintltst/creststn.c
index 1e96154b..4fe69d7a 100644
--- a/icuSources/test/cintltst/creststn.c
+++ b/icuSources/test/cintltst/creststn.c
@@ -1,11 +1,13 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2008, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /*******************************************************************************
 *
-* File CRESTST.C
+* File creststn.c
 *
 * Modification History:
 *        Name              Date               Description
@@ -21,7 +23,10 @@
 #include "unicode/putil.h"
 #include "unicode/ustring.h"
 #include "unicode/ucnv.h"
+#include "unicode/utf8.h"
+#include "unicode/utf16.h"
 #include "string.h"
+#include "cmemory.h"
 #include "cstring.h"
 #include "unicode/uchar.h"
 #include "ucol_imp.h"  /* for U_ICUDATA_COLL */
@@ -29,10 +34,13 @@
 #define RESTEST_HEAP_CHECK 0
 
 #include "unicode/uloc.h"
+#include "unicode/ulocdata.h"
 #include "uresimp.h"
 #include "creststn.h"
 #include "unicode/ctest.h"
 #include "ucbuf.h"
+#include "ureslocs.h"
+
 static int32_t pass;
 static int32_t fail;
 
@@ -167,7 +175,8 @@ param[] =
   { "ne",           U_USING_DEFAULT_WARNING,  e_Root,    { TRUE, FALSE, FALSE }, { TRUE, FALSE, FALSE } }
 };
 
-static int32_t bundles_count = sizeof(param) / sizeof(param[0]);
+static int32_t bundles_count = UPRV_LENGTHOF(param);
+
 
 
 /*static void printUChars(UChar*);*/
@@ -177,6 +186,7 @@ static void TestGetFunctionalEquivalent(void);
 static void TestCLDRStyleAliases(void);
 static void TestFallbackCodes(void);
 static void TestGetUTF8String(void);
+static void TestCLDRVersion(void);
 
 /***************************************************************************************/
 
@@ -185,13 +195,10 @@ static void TestGetUTF8String(void);
 void addNEWResourceBundleTest(TestNode** root)
 {
     addTest(root, &TestErrorCodes,            "tsutil/creststn/TestErrorCodes");
+#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION   
     addTest(root, &TestEmptyBundle,           "tsutil/creststn/TestEmptyBundle");
     addTest(root, &TestConstruction1,         "tsutil/creststn/TestConstruction1");
     addTest(root, &TestResourceBundles,       "tsutil/creststn/TestResourceBundles");
-    addTest(root, &TestFallback,              "tsutil/creststn/TestFallback");
-    addTest(root, &TestGetVersion,            "tsutil/creststn/TestGetVersion");
-    addTest(root, &TestGetVersionColl,        "tsutil/creststn/TestGetVersionColl");
-    addTest(root, &TestAliasConflict,         "tsutil/creststn/TestAliasConflict");
     addTest(root, &TestNewTypes,              "tsutil/creststn/TestNewTypes");
     addTest(root, &TestEmptyTypes,            "tsutil/creststn/TestEmptyTypes");
     addTest(root, &TestBinaryCollationData,   "tsutil/creststn/TestBinaryCollationData");
@@ -200,14 +207,22 @@ void addNEWResourceBundleTest(TestNode** root)
     addTest(root, &TestDecodedBundle,         "tsutil/creststn/TestDecodedBundle");
     addTest(root, &TestResourceLevelAliasing, "tsutil/creststn/TestResourceLevelAliasing");
     addTest(root, &TestDirectAccess,          "tsutil/creststn/TestDirectAccess"); 
+    addTest(root, &TestTicket9804,            "tsutil/creststn/TestTicket9804"); 
+    addTest(root, &TestXPath,                 "tsutil/creststn/TestXPath");
+    addTest(root, &TestCLDRStyleAliases,      "tsutil/creststn/TestCLDRStyleAliases");
+    addTest(root, &TestFallbackCodes,         "tsutil/creststn/TestFallbackCodes");
+    addTest(root, &TestGetUTF8String,         "tsutil/creststn/TestGetUTF8String");
+    addTest(root, &TestCLDRVersion,           "tsutil/creststn/TestCLDRVersion");
+    addTest(root, &TestPreventFallback,       "tsutil/creststn/TestPreventFallback");
+#endif
+    addTest(root, &TestFallback,              "tsutil/creststn/TestFallback");
+    addTest(root, &TestGetVersion,            "tsutil/creststn/TestGetVersion");
+    addTest(root, &TestGetVersionColl,        "tsutil/creststn/TestGetVersionColl");
+    addTest(root, &TestAliasConflict,         "tsutil/creststn/TestAliasConflict");
     addTest(root, &TestGetKeywordValues,      "tsutil/creststn/TestGetKeywordValues"); 
     addTest(root, &TestGetFunctionalEquivalent,"tsutil/creststn/TestGetFunctionalEquivalent");
     addTest(root, &TestJB3763,                "tsutil/creststn/TestJB3763");
-    addTest(root, &TestXPath,                 "tsutil/creststn/TestXPath"); 
-    addTest(root, &TestCLDRStyleAliases,      "tsutil/creststn/TestCLDRStyleAliases");
-    addTest(root, &TestFallbackCodes,         "tsutil/creststn/TestFallbackCodes");    
     addTest(root, &TestStackReuse,            "tsutil/creststn/TestStackReuse");
-    addTest(root, &TestGetUTF8String,         "tsutil/creststn/TestGetUTF8String");
 }
 
 
@@ -237,7 +252,7 @@ static void checkStatus(int32_t line, UErrorCode expected, UErrorCode status) {
     log_data_err("Resource not present, cannot test (%s:%d)\n", __FILE__, line);
   }
   if(status != expected) {
-    log_err("%s:%d: Expected error code %s, got error code %s\n", __FILE__, line, u_errorName(expected), u_errorName(status));
+    log_err_status(status, "%s:%d: Expected error code %s, got error code %s\n", __FILE__, line, u_errorName(expected), u_errorName(status));
   }
 }
 
@@ -252,30 +267,24 @@ static void TestErrorCodes(void) {
   checkStatus(__LINE__, U_USING_FALLBACK_WARNING, status);
   ures_close(r);
 
-  /* this bundle should return zero error, so it shouldn't change the status*/
+  /* this bundle should return zero error, so it shouldn't change the status */
   status = U_USING_DEFAULT_WARNING;
   r = ures_open(NULL, "ti_ER", &status);
   checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
 
   /* we look up the resource which is aliased, but it lives in fallback */
+
   if(U_SUCCESS(status) && r != NULL) {
-    status = U_USING_DEFAULT_WARNING; 
-    r2 = ures_getByKey(r, "Languages", NULL, &status);  /* languages of 'ti' aliases to 'am' */
+    status = U_USING_DEFAULT_WARNING;
+    r2 = ures_getByKey(r, "ExemplarCharacters", NULL, &status);  /* ExemplarCharacters lives in ti */
     checkStatus(__LINE__, U_USING_FALLBACK_WARNING, status);
-  } 
+  }
   ures_close(r);
 
-  /* this bundle should return zero error, so it shouldn't change the status*/
+  /* this bundle should return zero error, so it shouldn't change the status */
   status = U_USING_DEFAULT_WARNING;
-  r = ures_open(NULL, "ti", &status);
+  r = ures_open(U_ICUDATA_REGION, "ti", &status);
   checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
-
-  /* we look up the resource which is aliased and at our level */
-  if(U_SUCCESS(status) && r != NULL) {
-    status = U_USING_DEFAULT_WARNING; 
-    r2 = ures_getByKey(r, "Languages", r2, &status);
-    checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
-  }
   ures_close(r);
 
   status = U_USING_FALLBACK_WARNING;
@@ -284,34 +293,35 @@ static void TestErrorCodes(void) {
   ures_close(r);
   ures_close(r2);
 
+#if !UCONFIG_NO_COLLATION
   /** Now, with the collation bundle **/
-  
+ 
   /* first bundle should return fallback warning */
   r = ures_open(U_ICUDATA_COLL, "sr_YU_VOJVODINA", &status);
   checkStatus(__LINE__, U_USING_FALLBACK_WARNING, status);
   ures_close(r);
 
-  /* this bundle should return zero error, so it shouldn't change the status*/
+  /* this bundle should return zero error, so it shouldn't change the status */
   status = U_USING_FALLBACK_WARNING;
   r = ures_open(U_ICUDATA_COLL, "sr", &status);
   checkStatus(__LINE__, U_USING_FALLBACK_WARNING, status);
 
   /* we look up the resource which is aliased  */
   if(U_SUCCESS(status) && r != NULL) {
-    status = U_USING_DEFAULT_WARNING; 
+    status = U_USING_DEFAULT_WARNING;
     r2 = ures_getByKey(r, "collations", NULL, &status);
     checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
-  } 
+  }
   ures_close(r);
 
-  /* this bundle should return zero error, so it shouldn't change the status*/
+  /* this bundle should return zero error, so it shouldn't change the status */
   status = U_USING_DEFAULT_WARNING;
   r = ures_open(U_ICUDATA_COLL, "sr", &status);
   checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
 
   /* we look up the resource which is aliased and at our level */
   if(U_SUCCESS(status) && r != NULL) {
-    status = U_USING_DEFAULT_WARNING; 
+    status = U_USING_DEFAULT_WARNING;
     r2 = ures_getByKey(r, "collations", r2, &status);
     checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
   }
@@ -322,6 +332,7 @@ static void TestErrorCodes(void) {
   checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
   ures_close(r);
   ures_close(r2);
+#endif  /* !UCONFIG_NO_COLLATION */
 }
 
 static void TestAliasConflict(void) {
@@ -338,21 +349,21 @@ static void TestAliasConflict(void) {
     he = ures_open(NULL, "he", &status);
     iw = ures_open(NULL, "iw", &status);
     if(U_FAILURE(status)) { 
-        log_err("Failed to get resource with %s\n", myErrorName(status));
+        log_err_status(status, "Failed to get resource with %s\n", myErrorName(status));
     }
     ures_close(iw);
     result = ures_getStringByKey(he, "ExemplarCharacters", &resultLen, &status);
     if(U_FAILURE(status) || result == NULL) { 
-        log_err("Failed to get resource ExemplarCharacters with %s\n", myErrorName(status));
+        log_err_status(status, "Failed to get resource ExemplarCharacters with %s\n", myErrorName(status));
     }
     ures_close(he);
 
-    size = sizeof(norwayNames)/sizeof(norwayNames[0]);
+    size = UPRV_LENGTHOF(norwayNames);
     for(i = 0; i < size; i++) {
         status = U_ZERO_ERROR;
         norway = ures_open(NULL, norwayNames[i], &status);
         if(U_FAILURE(status)) { 
-            log_err("Failed to get resource with %s for %s\n", myErrorName(status), norwayNames[i]);
+            log_err_status(status, "Failed to get resource with %s for %s\n", myErrorName(status), norwayNames[i]);
             continue;
         }
         realName = ures_getLocale(norway, &status);
@@ -418,14 +429,10 @@ static void TestDecodedBundle(){
     /* pre-flight */
     int32_t num =0;
     const char *testdatapath = loadTestData(&error);
-    resB = ures_open(testdatapath, "iscii", &error);
+    resB = ures_open(testdatapath, "encoded", &error);
     srcFromRes=tres_getString(resB,-1,"str",&len,&error);
     if(U_FAILURE(error)){
-#if UCONFIG_NO_LEGACY_CONVERSION
-        log_info("Couldn't load iscii.bin from test data bundle, (because UCONFIG_NO_LEGACY_CONVERSION  is turned on)\n");
-#else
-        log_data_err("Could not find iscii.bin from test data bundle. Error: %s\n", u_errorName(error));
-#endif
+        log_data_err("Could not find encoded.res from test data bundle. Error: %s\n", u_errorName(error));
         ures_close(resB);
         return;
     }
@@ -757,7 +764,7 @@ static void TestEmptyTypes() {
     int32_t len = 0;
     int32_t intResult = 0;
     const UChar *zeroString;
-    const int32_t *zeroIntVect;
+    const int32_t *zeroIntVect = NULL;
 
     strcpy(action, "Construction of testtypes bundle");
     testdatapath=loadTestData(&status);
@@ -832,6 +839,7 @@ static void TestEmptyTypes() {
     }
     else {
         zeroIntVect=ures_getIntVector(res, &len, &status);
+        (void)zeroIntVect;    /* Suppress set but not used warning. */
         if(!U_SUCCESS(status) || resArray != NULL || len != 0) {
             log_err("Shouldn't get emptyintv\n");
         }
@@ -848,8 +856,9 @@ static void TestEmptyTypes() {
     }
     else {
         binResult=ures_getBinary(res, &len, &status);
-        if(!U_SUCCESS(status) || binResult != NULL || len != 0) {
-            log_err("Shouldn't get emptybin\n");
+        (void)binResult;      /* Suppress set but not used warning. */
+        if(!U_SUCCESS(status) || len != 0) {
+            log_err("Couldn't get emptybin, or it's not empty\n");
         }
     }
 
@@ -865,7 +874,7 @@ static void TestEmptyTypes() {
     else {
         resArray=ures_getByIndex(res, 0, resArray, &status);
         if(U_SUCCESS(status) || resArray != NULL){
-            log_err("Shouldn't get emptyarray\n");
+            log_err("Shouldn't get emptyarray[0]\n");
         }
     }
 
@@ -881,7 +890,7 @@ static void TestEmptyTypes() {
     else {
         resArray=ures_getByIndex(res, 0, resArray, &status);
         if(U_SUCCESS(status) || resArray != NULL){
-            log_err("Shouldn't get emptytable\n");
+            log_err("Shouldn't get emptytable[0]\n");
         }
     }
 
@@ -914,11 +923,10 @@ static void TestEmptyBundle(){
 }
 
 static void TestBinaryCollationData(){
+#if !UCONFIG_NO_COLLATION 
     UErrorCode status=U_ZERO_ERROR;
     const char*      locale="te";
-#if !UCONFIG_NO_COLLATION 
     const char* testdatapath;
-#endif
     UResourceBundle *teRes = NULL;
     UResourceBundle *coll=NULL;
     UResourceBundle *binColl = NULL;
@@ -926,7 +934,6 @@ static void TestBinaryCollationData(){
     int32_t len=0;
     const char* action="testing the binary collaton data";
 
-#if !UCONFIG_NO_COLLATION 
     log_verbose("Testing binary collation data resource......\n");
 
     testdatapath=loadTestData(&status);
@@ -953,6 +960,7 @@ static void TestBinaryCollationData(){
             CONFIRM_ErrorCode(status, U_ZERO_ERROR);
             CONFIRM_INT_EQ(ures_getType(binColl), URES_BINARY);
             binResult=(uint8_t*)ures_getBinary(binColl,  &len, &status);
+            (void)binResult;    /* Suppress set but not used warning. */
             if(U_SUCCESS(status)){
                 CONFIRM_ErrorCode(status, U_ZERO_ERROR);
                 CONFIRM_INT_GE(len, 1);
@@ -1008,8 +1016,8 @@ static void TestAPI() {
     }
 #endif
 
-    u_memset(largeBuffer, 0x0030, sizeof(largeBuffer)/sizeof(largeBuffer[0]));
-    largeBuffer[sizeof(largeBuffer)/sizeof(largeBuffer[0])-1] = 0;
+    u_memset(largeBuffer, 0x0030, UPRV_LENGTHOF(largeBuffer));
+    largeBuffer[UPRV_LENGTHOF(largeBuffer)-1] = 0;
 
     /*Test ures_openU */
 
@@ -1022,7 +1030,7 @@ static void TestAPI() {
     status = U_ZERO_ERROR;
     ures_close(ures_openU(NULL, "root", &status));
     if(U_FAILURE(status)){
-        log_err("ERROR: ures_openU() failed path = NULL with %s\n", myErrorName(status));
+        log_err_status(status, "ERROR: ures_openU() failed path = NULL with %s\n", myErrorName(status));
     }
 
     status = U_ILLEGAL_ARGUMENT_ERROR;
@@ -1033,7 +1041,7 @@ static void TestAPI() {
     status = U_ZERO_ERROR;
     teRes=ures_openU(utestdatapath, "te", &status);
     if(U_FAILURE(status)){
-        log_err("ERROR: ures_openU() failed path =%s with %s\n", austrdup(utestdatapath), myErrorName(status));
+        log_err_status(status, "ERROR: ures_openU() failed path =%s with %s\n", austrdup(utestdatapath), myErrorName(status));
         return;
     }
     /*Test ures_getLocale() */
@@ -1045,6 +1053,7 @@ static void TestAPI() {
     teFillin=ures_getByKey(teRes, "tagged_array_in_te_te_IN", teFillin, &status);
     key=ures_getKey(teFillin);
     value=(UChar*)ures_getNextString(teFillin, &len, &key, &status);
+    (void)value;    /* Suppress set but not used warning. */
     ures_resetIterator(NULL);
     value=(UChar*)ures_getNextString(teFillin, &len, &key, &status);
     if(status !=U_INDEX_OUTOFBOUNDS_ERROR){
@@ -1169,7 +1178,7 @@ static void TestErrorConditions(){
         log_err("ERROR: ures_openU() is supposed to fail path =%s with status != U_ZERO_ERROR\n", austrdup(utestdatapath));
         ures_close(teRes);
     }
-    /*Test ures_openFillIn with UResourceBundle = NULL*/
+    /*Test ures_openFillIn fails when input UResourceBundle parameter is NULL*/
     log_verbose("Testing ures_openFillIn with UResourceBundle = NULL.....\n");
     status=U_ZERO_ERROR;
     ures_openFillIn(NULL, testdatapath, "te", &status);
@@ -1177,6 +1186,14 @@ static void TestErrorConditions(){
         log_err("ERROR: ures_openFillIn with UResourceBundle= NULL should fail.  Expected U_ILLEGAL_ARGUMENT_ERROR, Got: %s\n",
                         myErrorName(status));
     }
+    /*Test ures_openDirectFillIn fails when input UResourceBundle parameter is NULL*/
+    log_verbose("Testing ures_openDirectFillIn with UResourceBundle = NULL.....\n");
+    status=U_ZERO_ERROR;
+    ures_openDirectFillIn(NULL, testdatapath, "te", &status);
+    if(status != U_ILLEGAL_ARGUMENT_ERROR){
+        log_err("ERROR: ures_openDirectFillIn with UResourceBundle= NULL should fail.  Expected U_ILLEGAL_ARGUMENT_ERROR, Got: %s\n",
+                        myErrorName(status));
+    }
     /*Test ures_getLocale() with status != U_ZERO_ERROR*/
     status=U_ZERO_ERROR;
     teRes=ures_openU(utestdatapath, "te", &status);
@@ -1379,7 +1396,7 @@ static void TestGetVersion(){
         log_verbose("Testing version number for locale %s\n", locName);
         resB = ures_open(NULL,locName, &status);
         if (U_FAILURE(status)) {
-            log_err("Resource bundle creation for locale %s failed.: %s\n", locName, myErrorName(status));
+            log_err_status(status, "Resource bundle creation for locale %s failed.: %s\n", locName, myErrorName(status));
             ures_close(resB);
             return;
         }
@@ -1399,6 +1416,7 @@ static void TestGetVersion(){
 
 
 static void TestGetVersionColl(){
+#if !UCONFIG_NO_COLLATION
     UVersionInfo minVersionArray = {0x00, 0x00, 0x00, 0x00};
     UVersionInfo maxVersionArray = {0x50, 0x80, 0xcf, 0xcf};
     UVersionInfo versionArray;
@@ -1410,30 +1428,32 @@ static void TestGetVersionColl(){
     int32_t locLen;
     const UChar* rules =NULL;
     int32_t len = 0;
-    
+
+    /* test NUL termination of UCARules */
+    resB = ures_open(U_ICUDATA_COLL,locName, &status);
+    rules = tres_getString(resB,-1,"UCARules",&len, &status);
+    if(!rules || U_FAILURE(status)) {
+        log_data_err("Could not load UCARules for locale %s\n", locName);
+        status = U_ZERO_ERROR;
+    } else if(u_strlen(rules) != len){
+        log_err("UCARules string not nul terminated! \n");
+    }
+    ures_close(resB);
+
     log_verbose("The ures_getVersion(%s) tests begin : \n", U_ICUDATA_COLL);
     locs = ures_openAvailableLocales(U_ICUDATA_COLL, &status);
     if (U_FAILURE(status)) {
-       log_err("enumeration of %s failed.: %s\n", U_ICUDATA_COLL, myErrorName(status));
+       log_err_status(status, "enumeration of %s failed.: %s\n", U_ICUDATA_COLL, myErrorName(status));
        return;
     }
 
-    do{
+    for (;;) {
         log_verbose("Testing version number for locale %s\n", locName);
         resB = ures_open(U_ICUDATA_COLL,locName, &status);
         if (U_FAILURE(status)) {
             log_err("Resource bundle creation for locale %s:%s failed.: %s\n", U_ICUDATA_COLL, locName, myErrorName(status));
             ures_close(resB);
-            return;
-        }
-        /* test NUL termination of UCARules */
-        rules = tres_getString(resB,-1,"UCARules",&len, &status);
-        if(!rules || U_FAILURE(status)) {
-          log_data_err("Could not load UCARules for locale %s\n", locName);
-          continue;
-        }
-        if(u_strlen(rules) != len){
-            log_err("UCARules string not nul terminated! \n");
+            break;
         }
         ures_getVersion(resB, versionArray);
         for (i=0; i<4; ++i) {
@@ -1446,12 +1466,17 @@ static void TestGetVersionColl(){
             }
         }
         ures_close(resB);
-    } while((locName = uenum_next(locs,&locLen,&status))&&U_SUCCESS(status));
-    
-    if(U_FAILURE(status)) {
-        log_err("Err %s testing Collation locales.\n", u_errorName(status));
+        locName = uenum_next(locs, &locLen, &status);
+        if(U_FAILURE(status)) {
+            log_err("uenum_next(locs) error %s\n", u_errorName(status));
+            break;
+        }
+        if(locName == NULL) {
+            break;
+        }
     }
     uenum_close(locs);
+#endif  /* !UCONFIG_NO_COLLATION */
 }
 
 static void TestResourceBundles()
@@ -1588,7 +1613,7 @@ static UBool testTag(const char* frag,
     int32_t count = 0;
     int32_t row_count=0;
     int32_t column_count=0;
-    int32_t index = 0;
+    int32_t idx = 0;
     int32_t tag_count= 0;
     const char* testdatapath;
     char verboseOutput[256];
@@ -1764,25 +1789,25 @@ static UBool testTag(const char* frag,
 
 
         for (j=0; j<10; ++j){
-            index = count ? (randi(count * 3) - count) : (randi(200) - 100);
+            idx = count ? (randi(count * 3) - count) : (randi(200) - 100);
             status = U_ZERO_ERROR;
             string=kERROR;
             array=ures_getByKey(theBundle, tag, array, &status);
             if(!U_FAILURE(status)){
                 UChar *t=NULL;
-                t=(UChar*)ures_getStringByIndex(array, index, &len, &status);
+                t=(UChar*)ures_getStringByIndex(array, idx, &len, &status);
                 if(!U_FAILURE(status)){
                     UChar element[3];
                     string=t;
                     u_strcpy(expected_string, base);
-                    u_uastrcpy(element, itoa1(index,buf));
+                    u_uastrcpy(element, itoa1(idx,buf));
                     u_strcat(expected_string, element);
                 } else {
                     u_strcpy(expected_string, kERROR);
                 }
 
             }
-            expected_status = (index >= 0 && index < count) ? expected_resource_status : U_MISSING_RESOURCE_ERROR;
+            expected_status = (idx >= 0 && idx < count) ? expected_resource_status : U_MISSING_RESOURCE_ERROR;
             CONFIRM_ErrorCode(status,expected_status);
             CONFIRM_EQ(string,expected_string);
 
@@ -1908,11 +1933,11 @@ static UBool testTag(const char* frag,
             tag_count=ures_getSize(tags);
             CONFIRM_INT_GE((int32_t)tag_count, (int32_t)0); 
 
-            for(index=0; index <tag_count; index++){
+            for(idx=0; idx <tag_count; idx++){
                 UResourceBundle *tagelement=NULL;
                 const char *key=NULL;
                 UChar* value=NULL;
-                tagelement=ures_getByIndex(tags, index, tagelement, &status);
+                tagelement=ures_getByIndex(tags, idx, tagelement, &status);
                 key=ures_getKey(tagelement);
                 value=(UChar*)ures_getNextString(tagelement, &len, &key, &status);
                 log_verbose("tag = %s, value = %s\n", key, u_austrcpy(verboseOutput, value));
@@ -1929,13 +1954,13 @@ static UBool testTag(const char* frag,
 
         /*---------taggedArrayItem----------------------------------------------*/
         count = 0;
-        for (index=-20; index<20; ++index)
+        for (idx=-20; idx<20; ++idx)
         {
 
             status = U_ZERO_ERROR;
             string = kERROR;
             strcpy(item_tag, "tag");
-            strcat(item_tag, itoa1(index,buf));
+            strcat(item_tag, itoa1(idx,buf));
             tags=ures_getByKey(theBundle, tag, tags, &status);
             if(U_SUCCESS(status)){
                 UResourceBundle *tagelement=NULL;
@@ -1954,14 +1979,14 @@ static UBool testTag(const char* frag,
                         string=t;
                     }
                 }
-                if (index < 0) {
+                if (idx < 0) {
                     CONFIRM_ErrorCode(status,U_MISSING_RESOURCE_ERROR);
                 }
                 else{
                     if (status != U_MISSING_RESOURCE_ERROR) {
                         UChar element[3];
                         u_strcpy(expected_string, base);
-                        u_uastrcpy(element, itoa1(index,buf));
+                        u_uastrcpy(element, itoa1(idx,buf));
                         u_strcat(expected_string, element);
                         CONFIRM_EQ(string,expected_string);
                         count++;
@@ -1993,6 +2018,61 @@ static void record_fail()
     ++fail;
 }
 
+static void TestPreventFallback() {
+    UResourceBundle* theBundle = NULL;
+    const char* testdatapath;
+    UErrorCode status = U_ZERO_ERROR;
+    int32_t unused_len = 0;
+
+    testdatapath=loadTestData(&status);
+    if(U_FAILURE(status))
+    {
+        log_data_err("Could not load testdata.dat %s \n",myErrorName(status));
+        return;
+    }
+
+    // In te_IN locale, fallback of string_in_te_no_te_IN_fallback is blocked
+    // with the three empty-set (U+2205) chars.
+    theBundle = ures_open(testdatapath, "te_IN_NE", &status);
+    if(U_FAILURE(status))
+    {
+        log_data_err("Could not open resource bundle te_IN_NE %s \n",myErrorName(status));
+        return;
+    }
+
+    // Fallback is blocked
+    ures_getStringByKeyWithFallback(theBundle, "string_in_te_no_te_IN_fallback", &unused_len, &status);
+    if (status != U_MISSING_RESOURCE_ERROR)
+    {
+        log_err("Expected missing resource error for string_in_te_no_te_IN_fallback.");
+    }
+    status = U_ZERO_ERROR;
+
+    // This fallback should succeed
+    ures_getStringByKeyWithFallback(theBundle, "string_only_in_te", &unused_len, &status);
+    if(U_FAILURE(status))
+    {
+        log_err("Expected to find string_only_in_te %s \n",myErrorName(status));
+    }
+    status = U_ZERO_ERROR;
+    ures_close(theBundle);
+
+    // From te locale, we should be able to fetch string_in_te_no_te_IN_fallback.
+    theBundle = ures_open(testdatapath, "te", &status);
+    if(U_FAILURE(status))
+    {
+        log_data_err("Could not open resource bundle te_IN_NE %s \n",myErrorName(status));
+        return;
+    }
+    ures_getStringByKeyWithFallback(theBundle, "string_in_te_no_te_IN_fallback", &unused_len, &status);
+    if(U_FAILURE(status))
+    {
+        log_err("Expected to find string_in_te_no_te_IN_fallback %s \n",myErrorName(status));
+    }
+    status = U_ZERO_ERROR;
+    ures_close(theBundle);
+}
+
 /**
  * Test to make sure that the U_USING_FALLBACK_ERROR and U_USING_DEFAULT_ERROR
  * are set correctly
@@ -2010,7 +2090,7 @@ static void TestFallback()
     fr_FR = ures_open(NULL, "fr_FR", &status);
     if(U_FAILURE(status))
     {
-        log_err("Couldn't open fr_FR - %d\n", status);
+        log_err_status(status, "Couldn't open fr_FR - %s\n", u_errorName(status));
         return;
     }
 
@@ -2024,12 +2104,13 @@ static void TestFallback()
     status = U_ZERO_ERROR;
     junk = tres_getString(fr_FR, -1, "LocaleID", &resultLen, &status);
     status = U_ZERO_ERROR;
+    (void)junk;    /* Suppress set but not used warning. */
 
     /* OK first one. This should be a Default value. */
-    subResource = ures_getByKey(fr_FR, "MeasurementSystem", NULL, &status);
+    subResource = ures_getByKey(fr_FR, "layout", NULL, &status);
     if(status != U_USING_DEFAULT_WARNING)
     {
-        log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get CurrencyMap from fr_FR, got %s\n", 
+        log_data_err("Expected U_USING_DEFAULT_ERROR when trying to get layout from fr_FR, got %s\n", 
             u_errorName(status));
     }
 
@@ -2037,10 +2118,10 @@ static void TestFallback()
     ures_close(subResource);
 
     /* and this is a Fallback, to fr */
-    junk = tres_getString(fr_FR, -1, "Countries", &resultLen, &status);
+    junk = tres_getString(fr_FR, -1, "ExemplarCharacters", &resultLen, &status);
     if(status != U_USING_FALLBACK_WARNING)
     {
-        log_data_err("Expected U_USING_FALLBACK_ERROR when trying to get Countries from fr_FR, got %d\n", 
+        log_data_err("Expected U_USING_FALLBACK_ERROR when trying to get ExemplarCharacters from fr_FR, got %d\n", 
             status);
     }
     
@@ -2054,8 +2135,9 @@ static void TestFallback()
         UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err);
         UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
         UResourceBundle* tResB;
+        UResourceBundle* zoneResource;
         const UChar* version = NULL;
-        static const UChar versionStr[] = { 0x0031, 0x002E, 0x0034, 0x0035, 0x0000};
+        static const UChar versionStr[] = { 0x0032, 0x002E, 0x0031, 0x002E, 0x0034, 0x0037, 0x002E, 0x0038, 0x0032, 0x0000}; // 2.1.47.82 in nn_NO
 
         if(err != U_ZERO_ERROR){
             log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));
@@ -2070,14 +2152,15 @@ static void TestFallback()
             log_data_err("ures_getString(resLocID, &resultLen, &err) returned an unexpected version value. Expected '%s', but got '%s'\n",
                     x, g);
         }
-        tResB = ures_getByKey(myResB, "zoneStrings", NULL, &err);
+        zoneResource = ures_open(U_ICUDATA_ZONE, "no_NO_NY", &err);
+        tResB = ures_getByKey(zoneResource, "zoneStrings", NULL, &err);
         if(err != U_USING_FALLBACK_WARNING){
             log_err("Expected U_USING_FALLBACK_ERROR when trying to test no_NO_NY aliased with nn_NO_NY for zoneStrings err=%s\n",u_errorName(err));
         }
+        ures_close(tResB);
+        ures_close(zoneResource);
         ures_close(resLocID);
         ures_close(myResB);
-        ures_close(tResB);
-
     }
 
 }
@@ -2139,9 +2222,9 @@ static void TestResourceLevelAliasing(void) {
         status = U_ZERO_ERROR;
       }
       /* testing referencing/composed alias */
-      uk = ures_findResource("ja/LocaleScript/2", uk, &status);
+      uk = ures_findResource("ja/calendar/gregorian/DateTimePatterns/2", uk, &status);
       if((uk == NULL) || U_FAILURE(status)) {
-        log_err("Couldn't findResource('ja/LocaleScript/2') err %s\n", u_errorName(status));
+        log_err_status(status, "Couldn't findResource('ja/calendar/gregorian/DateTimePatterns/2') err %s\n", u_errorName(status));
         goto cleanup;
       } 
       
@@ -2151,16 +2234,16 @@ static void TestResourceLevelAliasing(void) {
       string = tres_getString(tb, -1, NULL, &strLen, &status);
       
       if(seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
-        log_err("Referencing alias didn't get the right string\n");
+        log_err("Referencing alias didn't get the right string (1)\n");
       }
       
       string = tres_getString(aliasB, -1, "referencingalias", &strLen, &status);
       if(seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
-        log_err("Referencing alias didn't get the right string\n");
+        log_err("Referencing alias didn't get the right string (2)\n");
       }
       
       checkStatus(__LINE__, U_ZERO_ERROR, status);
-      tb = ures_getByKey(aliasB, "LocaleScript", tb, &status);
+      tb = ures_getByKey(aliasB, "DateTimePatterns", tb, &status);
       checkStatus(__LINE__, U_ZERO_ERROR, status);
       tb = ures_getByIndex(tb, 2, tb, &status);
       checkStatus(__LINE__, U_ZERO_ERROR, status);
@@ -2170,28 +2253,9 @@ static void TestResourceLevelAliasing(void) {
       if(U_FAILURE(status)) {
         log_err("%s trying to get string via separate getters\n", u_errorName(status));
       } else if(seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
-        log_err("Referencing alias didn't get the right string\n");
+        log_err("Referencing alias didn't get the right string (3)\n");
       }
-      
 
-      {
-            UResourceBundle* ja = ures_open(U_ICUDATA_BRKITR,"ja", &status);
-            const UChar *got = NULL, *exp=NULL;
-            int32_t gotLen = 0, expLen=0;
-            ja = ures_getByKey(ja, "boundaries", ja, &status);
-            exp = tres_getString(ja, -1, "word", &expLen, &status);
-              
-            tb = ures_getByKey(aliasB, "boundaries", tb, &status);
-            got = tres_getString(tb, -1, "word", &gotLen, &status);
-                
-            if(U_FAILURE(status)) {
-                log_err("%s trying to read str boundaries\n", u_errorName(status));
-            } else if(gotLen != expLen || u_strncmp(exp, got, gotLen) != 0) {
-                log_err("Referencing alias didn't get the right data\n");
-            }
-            ures_close(ja);
-            status = U_ZERO_ERROR;
-      }
       /* simple alias */
       testtypes = ures_open(testdatapath, "testtypes", &status);
       strcpy(buffer, "menu/file/open");
@@ -2203,7 +2267,7 @@ static void TestResourceLevelAliasing(void) {
       string = tres_getString(tb, -1, NULL, &strLen, &status);
       
       if(U_FAILURE(status) || seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
-        log_err("Referencing alias didn't get the right string\n");
+        log_err("Referencing alias didn't get the right string (4)\n");
       }
       
       /* test indexed aliasing */
@@ -2212,11 +2276,11 @@ static void TestResourceLevelAliasing(void) {
       tb = ures_getByKey(tb, "zoneAlias2", tb, &status);
       string = tres_getString(tb, -1, NULL, &strLen, &status);
       
-      en = ures_findResource("en/zoneStrings/3/0", en, &status);
+      en = ures_findResource("/ICUDATA-zone/en/zoneStrings/3/0", en, &status);
       sequence = tres_getString(en, -1, NULL, &seqLen, &status);
       
       if(U_FAILURE(status) || seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
-        log_err("Referencing alias didn't get the right string\n");
+        log_err("Referencing alias didn't get the right string (5)\n");
       }
     }
     /* test getting aliased string by index */
@@ -2241,65 +2305,67 @@ static void TestResourceLevelAliasing(void) {
         const char *key = NULL;
         tb = ures_getByKey(aliasB, "testGetStringByKeyAliasing", tb, &status);
         if(U_FAILURE(status)) {
-            log_err("Couldn't get testGetStringByKeyAliasing resource\n");
-        }
-        for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
-            result = tres_getString(tb, -1, keys[i], &resultLen, &status);
-            if(U_FAILURE(status)){
-                log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
-                continue;
-            }
-            uBufferLen = u_unescape(strings[i], uBuffer, 256);
-            if(resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
-              log_err("Didn't get correct string while accesing alias table by key (%s)\n", keys[i]);
-            }
-        }
-        for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
-            result = tres_getString(tb, i, NULL, &resultLen, &status); 
-            if(U_FAILURE(status)){
-                log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
-                continue;
-            }
-            uBufferLen = u_unescape(strings[i], uBuffer, 256);
-            if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
-              log_err("Didn't get correct string while accesing alias table by index (%s)\n", strings[i]);
+          log_err("FAIL: Couldn't get testGetStringByKeyAliasing resource: %s\n", u_errorName(status));
+        } else {
+            for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
+                result = tres_getString(tb, -1, keys[i], &resultLen, &status);
+                if(U_FAILURE(status)){
+                    log_err("(1) Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
+                    continue;
+                }
+                uBufferLen = u_unescape(strings[i], uBuffer, 256);
+                if(resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
+                  log_err("(1) Didn't get correct string while accessing alias table by key (%s)\n", keys[i]);
+                }
             }
-        }
-        for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
-            result = ures_getNextString(tb, &resultLen, &key, &status);
-            if(U_FAILURE(status)){
-                log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
-                continue;
+            for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
+                result = tres_getString(tb, i, NULL, &resultLen, &status); 
+                if(U_FAILURE(status)){
+                    log_err("(2) Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
+                    continue;
+                }
+                uBufferLen = u_unescape(strings[i], uBuffer, 256);
+                if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
+                  log_err("(2) Didn't get correct string while accesing alias table by index (%s)\n", strings[i]);
+                }
             }
-            uBufferLen = u_unescape(strings[i], uBuffer, 256);
-            if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
-              log_err("Didn't get correct string while iterating over alias table (%s)\n", strings[i]);
+            for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
+                result = ures_getNextString(tb, &resultLen, &key, &status);
+                if(U_FAILURE(status)){
+                    log_err("(3) Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
+                    continue;
+                }
+                uBufferLen = u_unescape(strings[i], uBuffer, 256);
+                if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
+                  log_err("(3) Didn't get correct string while iterating over alias table (%s)\n", strings[i]);
+                }
             }
         }
         tb = ures_getByKey(aliasB, "testGetStringByIndexAliasing", tb, &status);
         if(U_FAILURE(status)) {
-            log_err("Couldn't get testGetStringByIndexAliasing resource\n");
-        }
-        for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
-            result = tres_getString(tb, i, NULL, &resultLen, &status);
-            if(U_FAILURE(status)){
-                log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
-                continue;
-            }
-            uBufferLen = u_unescape(strings[i], uBuffer, 256);
-            if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
-              log_err("Didn't get correct string while accesing alias by index in an array (%s)\n", strings[i]);
-            }
-        }
-        for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) {
-            result = ures_getNextString(tb, &resultLen, &key, &status);
-            if(U_FAILURE(status)){
-                log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
-                continue;
+          log_err("FAIL: Couldn't get testGetStringByIndexAliasing resource: %s\n", u_errorName(status));
+        } else {
+            for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
+                result = tres_getString(tb, i, NULL, &resultLen, &status);
+                if(U_FAILURE(status)){
+                    log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
+                    continue;
+                }
+                uBufferLen = u_unescape(strings[i], uBuffer, 256);
+                if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
+                  log_err("Didn't get correct string while accesing alias by index in an array (%s)\n", strings[i]);
+                }
             }
-            uBufferLen = u_unescape(strings[i], uBuffer, 256);
-            if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
-              log_err("Didn't get correct string while iterating over aliases in an array (%s)\n", strings[i]);
+            for(i = 0; i < UPRV_LENGTHOF(strings); i++) {
+                result = ures_getNextString(tb, &resultLen, &key, &status);
+                if(U_FAILURE(status)){
+                    log_err("Fetching the resource with key %s failed. Error: %s\n", keys[i], u_errorName(status));
+                    continue;
+                }
+                uBufferLen = u_unescape(strings[i], uBuffer, 256);
+                if(result==NULL || resultLen != uBufferLen || u_strncmp(result, uBuffer, resultLen) != 0) {
+                  log_err("Didn't get correct string while iterating over aliases in an array (%s)\n", strings[i]);
+                }
             }
         }
     }
@@ -2353,20 +2419,20 @@ static void TestDirectAccess(void) {
         }
     }
     
-    t = ures_findResource("ja/LocaleScript", t, &status);
+    t = ures_findResource("ja/ExemplarCharacters", t, &status);
     if(U_FAILURE(status)) {
         log_data_err("Couldn't access keyed resource, error %s\n", u_errorName(status));
         status = U_ZERO_ERROR;
     } else {
         key = ures_getKey(t);
-        if(strcmp(key, "LocaleScript")!=0) {
-            log_err("Got a strange key, expected 'LocaleScript', got %s\n", key);
+        if(strcmp(key, "ExemplarCharacters")!=0) {
+            log_err("Got a strange key, expected 'ExemplarCharacters', got %s\n", key);
         }
     }
     
-    t2 = ures_open(NULL, "sr", &status);
+    t2 = ures_open(U_ICUDATA_LANG, "sr", &status);
     if(U_FAILURE(status)) {
-        log_err("Couldn't open 'sr' resource bundle, error %s\n", u_errorName(status));
+        log_err_status(status, "Couldn't open 'sr' resource bundle, error %s\n", u_errorName(status));
         log_data_err("No 'sr', no test - you have bigger problems than testing direct access. "
                      "You probably have no data! Aborting this test\n");
     }
@@ -2416,7 +2482,7 @@ static void TestDirectAccess(void) {
     t2 = ures_getByKeyWithFallback(t2, "islamic-civil", t2, &status);
     t2 = ures_getByKeyWithFallback(t2, "eras", t2, &status);
     if(U_FAILURE(status)) {
-        log_err("Didn't get Eras. I know they are there!\n");
+        log_err_status(status, "Didn't get Eras. I know they are there!\n");
     }
     status = U_ZERO_ERROR;
 
@@ -2434,6 +2500,30 @@ static void TestDirectAccess(void) {
     ures_close(t);
 }
 
+static void TestTicket9804(void) {
+    UErrorCode status = U_ZERO_ERROR;
+    UResourceBundle *t = NULL;
+    t = ures_open(NULL, "he", &status);
+    t = ures_getByKeyWithFallback(t, "calendar/islamic-civil/DateTime", t, &status);
+    if(U_SUCCESS(status)) {
+        log_err("This resource does not exist. How did it get here?\n");
+    }
+    status = U_ZERO_ERROR;
+    ures_close(t);
+    t = ures_open(NULL, "he", &status);
+    t = ures_getByKeyWithFallback(t, "calendar/islamic-civil/eras", t, &status);
+    if(U_FAILURE(status)) {
+        log_err_status(status, "Didn't get Eras. I know they are there!\n");
+    } else {
+        const char *locale = ures_getLocaleByType(t, ULOC_ACTUAL_LOCALE, &status);
+        if (uprv_strcmp("he", locale) != 0) {
+            log_err("Eras should be in the 'he' locale, but was in: %s", locale);
+        }
+    }
+    status = U_ZERO_ERROR;
+    ures_close(t);
+}
+
 static void TestJB3763(void) {
     /* Nasty bug prevented using parent as fill-in, since it would
      * stomp the path information.
@@ -2445,7 +2535,7 @@ static void TestJB3763(void) {
     t = ures_getByKeyWithFallback(t, "gregorian", t, &status);
     t = ures_getByKeyWithFallback(t, "AmPmMarkers", t, &status);
     if(U_FAILURE(status)) {
-        log_err("This resource should be available?\n");
+        log_err_status(status, "This resource should be available?\n");
     }
     status = U_ZERO_ERROR;
 
@@ -2474,11 +2564,11 @@ static void TestGetKeywordValues(void) {
         }
     }
     if(foundStandard == FALSE) {
-        log_err("'standard' was not found in the keyword list.\n");
+        log_err_status(status, "'standard' was not found in the keyword list.\n");
     }
     uenum_close(kwVals);
     if(U_FAILURE(status)) {
-        log_err("err %s getting collation values\n", u_errorName(status));
+        log_err_status(status, "err %s getting collation values\n", u_errorName(status));
     }
     status = U_ZERO_ERROR;
 #endif
@@ -2498,11 +2588,11 @@ static void TestGetKeywordValues(void) {
         }
     }
     if(foundStandard == FALSE) {
-        log_err("'japanese' was not found in the calendar keyword list.\n");
+        log_err_status(status, "'japanese' was not found in the calendar keyword list.\n");
     }
     uenum_close(kwVals);
     if(U_FAILURE(status)) {
-        log_err("err %s getting calendar values\n", u_errorName(status));
+        log_err_status(status, "err %s getting calendar values\n", u_errorName(status));
     }
 }
 
@@ -2521,17 +2611,17 @@ static void TestGetFunctionalEquivalentOf(const char *path, const char *resName,
             resName, keyword, inLocale,
             &gotAvail, truncate, &status);
         if(U_FAILURE(status) || (len <= 0)) {
-            log_err("FAIL: got len %d, err %s  on #%d: %c\t%s\t%s\n",  
+            log_err_status(status, "FAIL: got len %d, err %s  on #%d: %c\t%s\t%s\n",  
                 len, u_errorName(status),
                 i/3,expectAvail?'t':'f', inLocale, expectLocale);
         } else {
             log_verbose("got:  %c   %s\n", expectAvail?'t':'f',equivLocale);
 
             if((gotAvail != expectAvail) || strcmp(equivLocale, expectLocale)) {
-                log_err("FAIL: got avail=%c, loc=%s but  expected #%d: %c\t%s\t-> loc=%s\n",  
-                    gotAvail?'t':'f', equivLocale,
-                    i/3,
-                    expectAvail?'t':'f', inLocale, expectLocale);
+                log_err("FAIL: #%d: %s -> expect avail=%c, loc=%s but get %c, loc=%s\n",
+                    i/3, inLocale,
+                    expectAvail?'t':'f', expectLocale,
+                    gotAvail?'t':'f',    equivLocale);
 
             }
         }
@@ -2539,12 +2629,14 @@ static void TestGetFunctionalEquivalentOf(const char *path, const char *resName,
 }
 
 static void TestGetFunctionalEquivalent(void) {
+#if !UCONFIG_NO_COLLATION
     static const char * const collCases[] = {
-        /*   avail   locale          equiv   */
-        "f",    "de_US_CALIFORNIA",               "de",
+        /* avail  locale                          equiv */
+        /* note: in ICU 64, empty locales are shown as available for collation */
+        "f",    "sv_US_CALIFORNIA",               "sv",
         "f",    "zh_TW@collation=stroke",         "zh@collation=stroke", /* alias of zh_Hant_TW */
         "t",    "zh_Hant_TW@collation=stroke",    "zh@collation=stroke",
-        "f",    "de_CN@collation=pinyin",         "de",
+        "f",    "sv_CN@collation=pinyin",         "sv",
         "t",    "zh@collation=pinyin",            "zh",
         "f",    "zh_CN@collation=pinyin",         "zh", /* alias of zh_Hans_CN */
         "t",    "zh_Hans_CN@collation=pinyin",    "zh",
@@ -2557,39 +2649,56 @@ static void TestGetFunctionalEquivalent(void) {
         "f",    "zh_MO",                          "zh@collation=stroke", /* alias of zh_Hant_MO */
         "t",    "zh_Hant_MO",                     "zh@collation=stroke",
         "f",    "zh_TW_STROKE",                   "zh@collation=stroke",
-        "f",    "zh_TW_STROKE@collation=big5han", "zh@collation=big5han",
-        "f",    "de_CN@calendar=japanese",        "de",
-        "t",    "de@calendar=japanese",           "de",
-        "f",    "zh_TW@collation=big5han",        "zh@collation=big5han", /* alias of zh_Hant_TW */
-        "t",    "zh_Hant_TW@collation=big5han",   "zh@collation=big5han",
-        "f",    "zh_TW@collation=gb2312han",      "zh@collation=gb2312han", /* alias of zh_Hant_TW */
-        "t",    "zh_Hant_TW@collation=gb2312han", "zh@collation=gb2312han",
-        "f",    "zh_CN@collation=big5han",        "zh@collation=big5han", /* alias of zh_Hans_CN */
-        "t",    "zh_Hans_CN@collation=big5han",   "zh@collation=big5han",
-        "f",    "zh_CN@collation=gb2312han",      "zh@collation=gb2312han", /* alias of zh_Hans_CN */
-        "t",    "zh_Hans_CN@collation=gb2312han", "zh@collation=gb2312han",
-        "t",    "zh@collation=big5han",           "zh@collation=big5han",
-        "t",    "zh@collation=gb2312han",         "zh@collation=gb2312han",
-        "t",    "hi_IN@collation=direct",         "hi@collation=direct",
+        "f",    "zh_TW_STROKE@collation=pinyin",  "zh",
+        "f",    "sv_CN@calendar=japanese",        "sv",
+        "t",    "sv@calendar=japanese",           "sv",
+        "f",    "zh_TW@collation=pinyin",         "zh", /* alias of zh_Hant_TW */
+        "t",    "zh_Hant_TW@collation=pinyin",    "zh",
+        "f",    "zh_CN@collation=stroke",         "zh@collation=stroke", /* alias of zh_Hans_CN */
+        "t",    "zh_Hans_CN@collation=stroke",    "zh@collation=stroke",
+        "t",    "de@collation=phonebook",         "de@collation=phonebook",
         "t",    "hi@collation=standard",          "hi",
-        "t",    "hi@collation=direct",            "hi@collation=direct",
-        "f",    "hi_AU@collation=direct;currency=CHF;calendar=buddhist",      "hi@collation=direct",
         "f",    "hi_AU@collation=standard;currency=CHF;calendar=buddhist",    "hi",
-        "t",    "de_DE@collation=pinyin",         "de", /* bug 4582 tests */
-        "f",    "de_DE_BONN@collation=pinyin",    "de",
+        "f",    "sv_SE@collation=pinyin",         "sv", /* bug 4582 tests */
+        "f",    "sv_SE_BONN@collation=pinyin",    "sv",
         "t",    "nl",                             "root",
-        "t",    "nl_NL",                          "root",
+        "f",    "nl_NL",                          "root",
         "f",    "nl_NL_EEXT",                     "root",
         "t",    "nl@collation=stroke",            "root",
-        "t",    "nl_NL@collation=stroke",         "root",
+        "f",    "nl_NL@collation=stroke",         "root",
         "f",    "nl_NL_EEXT@collation=stroke",    "root",
+        /* Additions to test aliased locales */
+        "f",    "yue_HK",                         "zh@collation=stroke",
+        "f",    "yue_Hant",                       "zh@collation=stroke",
+        "f",    "yue_Hant_HK",                    "zh@collation=stroke",
+        "f",    "yue@collation=stroke",           "zh@collation=stroke",
+        "f",    "yue@collation=pinyin",           "zh",
+        "f",    "yue_CN",                         "zh",
+        "f",    "yue_Hans",                       "zh",
+        "f",    "yue_Hans_CN",                    "zh",
+        "f",    "yue_Hans@collation=pinyin",      "zh",
+        "f",    "yue_Hans@collation=stroke",      "zh@collation=stroke",
+        "f",    "mo",                             "mo", /* ? */
+        "f",    "no",                             "no", /* ? */
+        "f",    "ars",                            "ars", /* ? */
+        "t",    "wuu",                            "wuu", /* ? */
+        /* Additions to test locales without resources */
+        "f",    "en_CN",                          "root",
+        "f",    "zh_Hant_CN",                     "zh@collation=stroke",
+        "f",    "zh_Hant_US",                     "zh@collation=stroke",
+        "f",    "zh_Hans_US",                     "zh",
+        "f",    "yue_TW",                         "zh@collation=stroke",
+        "f",    "yue_US",                         "zh@collation=stroke",
+        "f",    "ja_CN",                          "ja",
+        "f",    "ja_US",                          "ja",
         NULL
     };
+#endif  /* !UCONFIG_NO_COLLATION */
 
     static const char *calCases[] = {
-        /*   avail   locale                       equiv   */
-        "t",    "en_US_POSIX",                   "en_US@calendar=gregorian",
-        "f",    "ja_JP_TOKYO",                   "ja_JP@calendar=gregorian",
+        /* avail  locale                        equiv */
+        "t",    "en_US_POSIX",                   "en@calendar=gregorian",
+        "f",    "ja_JP_TOKYO",                   "ja@calendar=gregorian",
         "f",    "ja_JP_TOKYO@calendar=japanese", "ja@calendar=japanese",
         "t",    "sr@calendar=gregorian", "sr@calendar=gregorian",
         "t",    "en", "en@calendar=gregorian",
@@ -2612,6 +2721,7 @@ static void TestGetFunctionalEquivalent(void) {
         len = ures_getFunctionalEquivalent(equivLocale, 255, U_ICUDATA_COLL,
             "calendar", "calendar", "ar_EG@calendar=islamic", 
             &gotAvail, FALSE, &status);
+        (void)len;    /* Suppress set but not used warning. */
 
         if(status == U_MISSING_RESOURCE_ERROR) {
             log_verbose("PASS: Got expected U_MISSING_RESOURCE_ERROR\n");
@@ -2717,7 +2827,7 @@ static void TestCLDRStyleAliases(void) {
       /* instead of sprintf(resource, "a%i", i); */
       a = ures_getByKeyWithFallback(alias, resource, a, &status);
       result = tres_getString(a, -1, NULL, &len, &status);
-      u_charsToUChars(expects[i], expected, strlen(expects[i])+1);
+      u_charsToUChars(expects[i], expected, (int32_t)strlen(expects[i])+1);
       if(U_FAILURE(status) || !result || u_strcmp(result, expected)) {
         log_err("CLDR style aliases failed resource with name \"%s\" resource, exp %s, got %S (%s)\n", resource, expects[i], result, myErrorName(status)); 
         status = U_ZERO_ERROR;
@@ -2791,7 +2901,7 @@ static void TestStackReuse(void) {
  */
 extern const UChar *
 tres_getString(const UResourceBundle *resB,
-               int32_t index, const char *key,
+               int32_t idx, const char *key,
                int32_t *length,
                UErrorCode *status) {
     char buffer8[16];
@@ -2805,8 +2915,8 @@ tres_getString(const UResourceBundle *resB,
     if(length == NULL) {
         length = &length16;
     }
-    if(index >= 0) {
-        s16 = ures_getStringByIndex(resB, index, length, status);
+    if(idx >= 0) {
+        s16 = ures_getStringByIndex(resB, idx, length, status);
     } else if(key != NULL) {
         s16 = ures_getStringByKey(resB, key, length, status);
     } else {
@@ -2821,8 +2931,8 @@ tres_getString(const UResourceBundle *resB,
     for(forceCopy = FALSE; forceCopy <= TRUE; ++forceCopy) {
         p8 = buffer8;
         length8 = (int32_t)sizeof(buffer8);
-        if(index >= 0) {
-            s8 = ures_getUTF8StringByIndex(resB, index, p8, &length8, forceCopy, status);
+        if(idx >= 0) {
+            s8 = ures_getUTF8StringByIndex(resB, idx, p8, &length8, forceCopy, status);
         } else if(key != NULL) {
             s8 = ures_getUTF8StringByKey(resB, key, p8, &length8, forceCopy, status);
         } else {
@@ -2838,8 +2948,8 @@ tres_getString(const UResourceBundle *resB,
             if(p8 == NULL) {
                 return s16;
             }
-            if(index >= 0) {
-                s8 = ures_getUTF8StringByIndex(resB, index, p8, &length8, forceCopy, status);
+            if(idx >= 0) {
+                s8 = ures_getUTF8StringByIndex(resB, idx, p8, &length8, forceCopy, status);
             } else if(key != NULL) {
                 s8 = ures_getUTF8StringByKey(resB, key, p8, &length8, forceCopy, status);
             } else {
@@ -2856,13 +2966,13 @@ tres_getString(const UResourceBundle *resB,
 
         if(forceCopy && s8 != p8) {
             log_err("ures_getUTF8String(%p, %ld, '%s') did not write the string to dest\n",
-                    resB, (long)index, key);
+                    resB, (long)idx, key);
         }
 
         /* verify NUL-termination */
         if((p8 != buffer8 || length8 < sizeof(buffer8)) && s8[length8] != 0) {
             log_err("ures_getUTF8String(%p, %ld, '%s') did not NUL-terminate\n",
-                    resB, (long)index, key);
+                    resB, (long)idx, key);
         }
         /* verify correct string */
         i16 = i8 = 0;
@@ -2871,17 +2981,17 @@ tres_getString(const UResourceBundle *resB,
             U8_NEXT(s8, i8, length8, c8);
             if(c16 != c8) {
                 log_err("ures_getUTF8String(%p, %ld, '%s') got a bad string, c16=U+%04lx!=U+%04lx=c8 before i16=%ld\n",
-                        resB, (long)index, key, (long)c16, (long)c8, (long)i16);
+                        resB, (long)idx, key, (long)c16, (long)c8, (long)i16);
             }
         }
         /* verify correct length */
         if(i16 < length16) {
             log_err("ures_getUTF8String(%p, %ld, '%s') UTF-8 string too short, length8=%ld, length16=%ld\n",
-                    resB, (long)index, key, (long)length8, (long)length16);
+                    resB, (long)idx, key, (long)length8, (long)length16);
         }
         if(i8 < length8) {
             log_err("ures_getUTF8String(%p, %ld, '%s') UTF-8 string too long, length8=%ld, length16=%ld\n",
-                    resB, (long)index, key, (long)length8, (long)length16);
+                    resB, (long)idx, key, (long)length8, (long)length16);
         }
 
         /* clean up */
@@ -2927,6 +3037,7 @@ TestGetUTF8String() {
     status = U_ZERO_ERROR;
     length8 = (int32_t)sizeof(buffer8);
     s8 = ures_getUTF8StringByKey(res, "string_only_in_Root", buffer8, &length8, FALSE, &status);
+    (void)s8;    /* Suppress set but not used warning. */
     if(status != U_ZERO_ERROR) {
         log_err("ures_getUTF8StringByKey(testdata/root string) malfunctioned - %s\n", u_errorName(status));
     }
@@ -2949,3 +3060,69 @@ TestGetUTF8String() {
 
     ures_close(res);
 }
+
+static void TestCLDRVersion(void) {
+  UVersionInfo zeroVersion;
+  UVersionInfo testExpect;
+  UVersionInfo testCurrent;
+  UVersionInfo cldrVersion;
+  char tmp[200];
+  UErrorCode status = U_ZERO_ERROR;
+
+  /* setup the constant value */
+  u_versionFromString(zeroVersion, "0.0.0.0");
+
+  /* test CLDR value from API */
+  ulocdata_getCLDRVersion(cldrVersion, &status);
+  if(U_FAILURE(status)) {
+    /* the show is pretty much over at this point */
+    log_err_status(status, "FAIL: ulocdata_getCLDRVersion() returned %s\n", u_errorName(status));
+    return;
+  } else {
+    u_versionToString(cldrVersion, tmp);
+    log_info("ulocdata_getCLDRVersion() returned: '%s'\n", tmp);
+  }
+
+  
+  /* setup from resource bundle */
+  {
+    UResourceBundle *res;
+    const char *testdatapath;
+
+    status = U_ZERO_ERROR;
+    testdatapath = loadTestData(&status);
+    if(U_FAILURE(status)) {
+        log_data_err("Could not load testdata.dat - %s\n", u_errorName(status));
+        return;
+    }
+
+    res = ures_openDirect(testdatapath, "root", &status);
+    if(U_FAILURE(status)) {
+        log_err("Unable to ures_open(testdata, \"\") - %s\n", u_errorName(status
+));
+        return;
+    }
+    ures_getVersionByKey(res, "ExpectCLDRVersionAtLeast", testExpect, &status);
+    ures_getVersionByKey(res, "CurrentCLDRVersion", testCurrent, &status);
+    ures_close(res);
+    if(U_FAILURE(status)) {
+        log_err("Unable to get test data for CLDR version - %s\n", u_errorName(status));
+    }
+  }
+  if(U_FAILURE(status)) return;
+
+
+  u_versionToString(testExpect,tmp);
+  log_verbose("(data) ExpectCLDRVersionAtLeast { %s }\n", tmp); 
+  if(memcmp(cldrVersion, testExpect, sizeof(UVersionInfo)) < 0) {
+    log_data_err("CLDR version is too old, expect at least %s.", tmp);
+  }
+  u_versionToString(testCurrent,tmp);
+  log_verbose("(data) CurrentCLDRVersion { %s }\n", tmp); 
+  switch(memcmp(cldrVersion, testCurrent, sizeof(UVersionInfo))) {
+    case 0: break; /* OK- current. */
+    case -1: log_info("CLDR version is behind 'current' (for testdata/root.txt) %s. Some things may fail.\n", tmp); break;
+    case 1: log_info("CLDR version is ahead of 'current' (for testdata/root.txt) %s. Some things may fail.\n", tmp); break;
+  }
+
+}