Update ICU to 54.1 step 1

source/test/cintltst/ucnvseltst.c

 /********************************************************************
- * Copyright (c) 1997-2011, International Business Machines
+ * Copyright (c) 1997-2014, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *
  * File UCNVSELTST.C
  *
  * Modification History:
  *        Name                     Description
  *     MOHAMED ELDAWY               Creation
  ********************************************************************
  */
 
 /* C API AND FUNCTIONALITY TEST FOR CONVERTER SELECTOR (ucnvsel.h)*/
 
 #include "ucnvseltst.h"
 
 #include <stdio.h>
 
 #include "unicode/utypes.h"
 #include "unicode/ucnvsel.h"
 #include "unicode/ustring.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "propsvec.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define FILENAME_BUFFER 1024
 
 #define TDSRCPATH  ".." U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING
 
 static void TestSelector(void);
 static void TestUPropsVector(void);
 void addCnvSelTest(TestNode** root);  /* Declaration required to suppress compiler warnings. */
 
 void addCnvSelTest(TestNode** root)
 {
@@ skipping 347 matching lines @@
   }
   if (!text_open(&text)) {
     releaseAvailableNames();;
   }
 
   excluded_sets[0] = uset_openEmpty();
   for(i = 1 ; i < 3 ; i++) {
     excluded_sets[i] = uset_open(i*30, i*30+500);
   }
 
-  for(testCaseIdx = 0; testCaseIdx < LENGTHOF(getEncodingsFns); testCaseIdx++)
+  for(testCaseIdx = 0; testCaseIdx < UPRV_LENGTHOF(getEncodingsFns); testCaseIdx++)
   {
     int32_t excluded_set_id;
     int32_t num_encodings;
     const char **encodings = getEncodingsFns[testCaseIdx](&num_encodings);
     if (getTestOption(QUICK_OPTION) && num_encodings > 25) {
       uprv_free((void *)encodings);
       continue;
     }
 
     /*
      * for(excluded_set_id = 0 ; excluded_set_id < 3 ; excluded_set_id++)
      *
      * This loop was replaced by the following statement because
      * the loop made the test run longer without adding to the code coverage.
      * The handling of the exclusion set is independent of the
      * set of encodings, so there is no need to test every combination.
      */
-    excluded_set_id = testCaseIdx % LENGTHOF(excluded_sets);
+    excluded_set_id = testCaseIdx % UPRV_LENGTHOF(excluded_sets);
     {
       UConverterSelector *sel_rt, *sel_fb;
       char *buffer_fb = NULL;
       UErrorCode status = U_ZERO_ERROR;
       sel_rt = ucnvsel_open(encodings, num_encodings,
                             excluded_sets[excluded_set_id],
                             UCNV_ROUNDTRIP_SET, &status);
       if (num_encodings == gCountAvailable) {
         /* test the special "all converters" parameter values */
         sel_fb = ucnvsel_open(NULL, 0,
@@ skipping 37 matching lines @@
                                        excluded_sets[excluded_set_id],
                                        UCNV_ROUNDTRIP_AND_FALLBACK_SET);
         /* UTF-8 with length */
         status = U_ZERO_ERROR;
         verifyResult(ucnvsel_selectForUTF8(sel_rt, s, length8, &status), manual_rt);
         verifyResult(ucnvsel_selectForUTF8(sel_fb, s, length8, &status), manual_fb);
         /* UTF-8 NUL-terminated */
         verifyResult(ucnvsel_selectForUTF8(sel_rt, s, -1, &status), manual_rt);
         verifyResult(ucnvsel_selectForUTF8(sel_fb, s, -1, &status), manual_fb);
 
-        u_strFromUTF8(utf16, LENGTHOF(utf16), &length16, s, length8, &status);
+        u_strFromUTF8(utf16, UPRV_LENGTHOF(utf16), &length16, s, length8, &status);
         if (U_FAILURE(status)) {
           log_err("error converting the test text (string %ld) to UTF-16 - %s\n",
                   (long)text.number, u_errorName(status));
         } else {
           if (text.number == 0) {
             sel_fb = serializeAndUnserialize(sel_fb, &buffer_fb, &status);
           }
           if (U_SUCCESS(status)) {
             /* UTF-16 with length */
             verifyResult(ucnvsel_selectForString(sel_rt, utf16, length16, &status), manual_rt);
@@ skipping 47 matching lines @@
     }
     if (upvec_getRow(pv, 0, NULL, NULL) == NULL) {
         log_err("upvec_getRow should not return NULL.\n");
     }
     if (upvec_getArray(pv, NULL, NULL) != NULL) {
         log_err("upvec_getArray should return NULL.\n");
     }
 
     upvec_close(pv);
 }