Update ICU to 54.1 step 1

source/test/cintltst/crestst.c

 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2013, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /*******************************************************************************
 *
 * File CRESTST.C
 *
 * Modification History:
 *        Name                     Description
 *     Madhu Katragadda            Ported for C API
 *  06/14/99     stephen           Updated for RB API changes (no suffix).
 ********************************************************************************
 */
 
 
 #include "unicode/utypes.h"
 #include "cintltst.h"
 #include "unicode/ustring.h"
 #include "cstring.h"
 #include "filestrm.h"
 #include <stdlib.h>
 
 #define RESTEST_HEAP_CHECK 0
 
 #include "unicode/ures.h"
 #include "crestst.h"
 #include "unicode/ctest.h"
 
-#include "ucol_imp.h" /* collation */
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 static void TestOpenDirect(void);
 static void TestFallback(void);
 static void TestTable32(void);
 static void TestFileStream(void);
 /*****************************************************************************/
 
 const UChar kERROR[] = { 0x0045 /*E*/, 0x0052 /*'R'*/, 0x0052 /*'R'*/,
              0x004F /*'O'*/, 0x0052/*'R'*/, 0x0000 /*'\0'*/};
 
 /*****************************************************************************/
@@ skipping 664 matching lines @@
             break;
         }
 
         if(number>=0 && number!=parsedNumber) {
             log_err("\"%s\" at %d in testdata/testtable32.res has a string/int value of %d, expected %d\n",
                     key, i, number, parsedNumber);
         }
     }
 
     /* search for some items by key */
-    for(i=0; i<LENGTHOF(testcases); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(testcases); ++i) {
         item=ures_getByKey(res, testcases[i].key, item, &errorCode);
         if(U_FAILURE(errorCode)) {
             log_err("unable to find the key \"%s\" in testdata/testtable32.res - %s\n",
                     testcases[i].key, u_errorName(errorCode));
             continue;
         }
 
         switch(ures_getType(item)) {
         case URES_STRING:
             s=ures_getString(item, &length, &errorCode);
@@ skipping 261 matching lines @@
         }
         
         res = ures_getByKey(rb, test[i].resourceKey, res, &status);
         if(U_FAILURE(status))
         {
             log_err("Couldn't find the key %s. Error: %s\n", test[i].resourceKey, u_errorName(status));
             ures_close(rb);
             status = U_ZERO_ERROR;
             continue;
         }
-        
+
         locale = ures_getLocaleByType(res, ULOC_REQUESTED_LOCALE, &status);
-        if(locale) {
+        if(U_SUCCESS(status) && locale != NULL) {
             log_err("Requested locale should return NULL\n");
         }
+        status = U_ZERO_ERROR;
         locale = ures_getLocaleByType(res, ULOC_VALID_LOCALE, &status);
         if(!locale || strcmp(locale, test[i].validLocale) != 0) {
             log_err("Expected valid locale to be %s. Got %s\n", test[i].requestedLocale, locale);
         }
         locale = ures_getLocaleByType(res, ULOC_ACTUAL_LOCALE, &status);
         if(!locale || strcmp(locale, test[i].actualLocale) != 0) {
             log_err("Expected actual locale to be %s. Got %s\n", test[i].requestedLocale, locale);
         }
         ures_close(rb);
     }
     ures_close(res);
 }
-