Update ICU to 54.1 step 1

source/test/intltest/genderinfotest.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /* Modification History:
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include <stdlib.h>
 #include "unicode/gender.h"
 #include "unicode/unum.h"
 #include "intltest.h"
-
-#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
+#include "cmemory.h"
 
 static const UGender kSingleFemale[] = {UGENDER_FEMALE};
 static const UGender kSingleMale[] = {UGENDER_MALE};
 static const UGender kSingleOther[] = {UGENDER_OTHER};
 
 static const UGender kAllFemale[] = {UGENDER_FEMALE, UGENDER_FEMALE};
 static const UGender kAllMale[] = {UGENDER_MALE, UGENDER_MALE};
 static const UGender kAllOther[] = {UGENDER_OTHER, UGENDER_OTHER};
 
 static const UGender kFemaleMale[] = {UGENDER_FEMALE, UGENDER_MALE};
@@ skipping 19 matching lines @@
     logln("TestSuite GenderInfoTest: ");
   }
   TESTCASE_AUTO_BEGIN;
   TESTCASE_AUTO(TestGetListGender);
   TESTCASE_AUTO(TestFallback);
   TESTCASE_AUTO_END;
 }
 
 void GenderInfoTest::TestGetListGender() {
     check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_OTHER, NULL, 0);
-    check(UGENDER_FEMALE, UGENDER_FEMALE, UGENDER_FEMALE, kSingleFemale, LENGTHOF(kSingleFemale));
-    check(UGENDER_MALE, UGENDER_MALE, UGENDER_MALE, kSingleMale, LENGTHOF(kSingleMale));
-    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_OTHER, kSingleOther, LENGTHOF(kSingleOther));
+    check(UGENDER_FEMALE, UGENDER_FEMALE, UGENDER_FEMALE, kSingleFemale, UPRV_LENGTHOF(kSingleFemale));
+    check(UGENDER_MALE, UGENDER_MALE, UGENDER_MALE, kSingleMale, UPRV_LENGTHOF(kSingleMale));
+    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_OTHER, kSingleOther, UPRV_LENGTHOF(kSingleOther));
 
-    check(UGENDER_OTHER, UGENDER_FEMALE, UGENDER_FEMALE, kAllFemale, LENGTHOF(kAllFemale));
-    check(UGENDER_OTHER, UGENDER_MALE, UGENDER_MALE, kAllMale, LENGTHOF(kAllMale));
-    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kAllOther, LENGTHOF(kAllOther));
+    check(UGENDER_OTHER, UGENDER_FEMALE, UGENDER_FEMALE, kAllFemale, UPRV_LENGTHOF(kAllFemale));
+    check(UGENDER_OTHER, UGENDER_MALE, UGENDER_MALE, kAllMale, UPRV_LENGTHOF(kAllMale));
+    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kAllOther, UPRV_LENGTHOF(kAllOther));
 
-    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kFemaleMale, LENGTHOF(kFemaleMale));
-    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kFemaleOther, LENGTHOF(kFemaleOther));
-    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kMaleOther, LENGTHOF(kMaleOther));
+    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kFemaleMale, UPRV_LENGTHOF(kFemaleMale));
+    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kFemaleOther, UPRV_LENGTHOF(kFemaleOther));
+    check(UGENDER_OTHER, UGENDER_OTHER, UGENDER_MALE, kMaleOther, UPRV_LENGTHOF(kMaleOther));
 }
 
 void GenderInfoTest::TestFallback() {
   UErrorCode status = U_ZERO_ERROR;
   const GenderInfo* actual = GenderInfo::getInstance("xx", status);
   if (U_FAILURE(status)) {
     errcheckln(status, "Fail to create GenderInfo - %s", u_errorName(status));
     return;
   }
   const GenderInfo* expected = GenderInfo::getNeutralInstance();
@@ skipping 34 matching lines @@
   if (actual != expected) {
     errln("For locale: %s expected: %d got %d", locale.getName(), expected, actual);
   }
 }
 
 extern IntlTest *createGenderInfoTest() {
   return new GenderInfoTest();
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */