Update ICU to 54.1 step 1

source/test/intltest/restest.cpp

 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2009, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
 #include "unicode/utypes.h"
 
 #include "cstring.h"
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/resbund.h"
 #include "restest.h"
 
 #include <stdlib.h>
 #include <time.h>
 #include <string.h>
 #include <limits.h>
 
 //***************************************************************************************
 
 static const UChar kErrorUChars[] = { 0x45, 0x52, 0x52, 0x4f, 0x52, 0 };
 static const int32_t kErrorLength = 5;
-static const int32_t kERROR_COUNT = -1234567;
 
 //***************************************************************************************
 
 enum E_Where
 {
     e_Root,
     e_te,
     e_te_IN,
     e_Where_count
 };
@@ skipping 571 matching lines @@
             continue;
         }
         
         ResourceBundle res = rb.get(test[i].resourceKey, status);
         if(U_FAILURE(status))
         {
             err("Couldn't find the key %s. Error: %s\n", test[i].resourceKey, u_errorName(status));
             status = U_ZERO_ERROR;
             continue;
         }
-        
+
         locale = res.getLocale(ULOC_REQUESTED_LOCALE, status);
-        if(locale != Locale::getDefault()) {
+        if(U_SUCCESS(status) && locale != Locale::getDefault()) {
             err("Expected requested locale to be %s. Got %s\n", test[i].requestedLocale, locale.getName());
         }
+        status = U_ZERO_ERROR;
         locale = res.getLocale(ULOC_VALID_LOCALE, status);
         if(strcmp(locale.getName(), test[i].validLocale) != 0) {
             err("Expected valid locale to be %s. Got %s\n", test[i].requestedLocale, locale.getName());
         }
         locale = res.getLocale(ULOC_ACTUAL_LOCALE, status);
         if(strcmp(locale.getName(), test[i].actualLocale) != 0) {
             err("Expected actual locale to be %s. Got %s\n", test[i].requestedLocale, locale.getName());
         }
     }
 }
-
-//eof
-