ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / transtst.cpp

diff --git a/icuSources/test/intltest/transtst.cpp b/icuSources/test/intltest/transtst.cpp
index 33f54a7e93bf4072e5c4bddf1ecdf7c7bd643903..d9d161b7817dfc1f33855fa9ec38236ded009369 100644 (file)
--- a/icuSources/test/intltest/transtst.cpp
+++ b/icuSources/test/intltest/transtst.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 1999-2014, International Business Machines
+*   Copyright (C) 1999-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -409,7 +409,7 @@ void TransliteratorTest::TestRuleBasedInverse(void) {
         "caccb", "xyzzy",
     };
 
-    int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     UErrorCode status = U_ZERO_ERROR;
     UParseError parseError;
@@ -457,7 +457,7 @@ void TransliteratorTest::TestKeyboard(void) {
         0, "AycAY", // null means finishKeyboardTransliteration
     };
 
-    keyboardAux(*t, DATA, (int32_t)(sizeof(DATA)/sizeof(DATA[0])));
+    keyboardAux(*t, DATA, UPRV_LENGTHOF(DATA));
     delete t;
 }
 
@@ -492,7 +492,7 @@ void TransliteratorTest::TestKeyboard2(void) {
         0, "AycAY", // null means finishKeyboardTransliteration
     };
 
-    keyboardAux(*t, DATA, (int32_t)(sizeof(DATA)/sizeof(DATA[0])));
+    keyboardAux(*t, DATA, UPRV_LENGTHOF(DATA));
     delete t;
 }
 
@@ -526,7 +526,7 @@ void TransliteratorTest::TestKeyboard3(void) {
         errln("FAIL: RBT constructor failed");
         return;
     }
-    keyboardAux(*t, DATA, (int32_t)(sizeof(DATA)/sizeof(DATA[0])));
+    keyboardAux(*t, DATA, UPRV_LENGTHOF(DATA));
     delete t;
 }
 
@@ -877,7 +877,7 @@ void TransliteratorTest::TestJ329(void) {
         { FALSE, "a > b; c > d" },
         { TRUE,  "a > b; no operator; c > d" },
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; ++i) {
         UErrorCode status = U_ZERO_ERROR;
@@ -921,7 +921,7 @@ void TransliteratorTest::TestSegments(void) {
         "a1 b2",
         "a1.a.1 b2.b.2",
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA)/sizeof(*DATA));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; i+=3) {
         logln("Pattern: " + prettify(DATA[i]));
@@ -953,7 +953,7 @@ void TransliteratorTest::TestCursorOffset(void) {
 
         "prbetaxyz preBETApost",
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA)/sizeof(*DATA));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; i+=3) {
         logln("Pattern: " + prettify(DATA[i]));
@@ -994,7 +994,7 @@ void TransliteratorTest::TestArbitraryVariableValues(void) {
         "ab xYzxyz stY78",
         "ABE ENDEND 1129",
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA)/sizeof(*DATA));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; i+=3) {
         logln("Pattern: " + prettify(DATA[i]));
@@ -1039,7 +1039,7 @@ void TransliteratorTest::TestPositionHandling(void) {
         3, 8, 3, 8,
     };
 
-    int32_t n = (int32_t)(sizeof(DATA) / sizeof(DATA[0])) / 3;
+    int32_t n = UPRV_LENGTHOF(DATA) / 3;
     for (int32_t i=0; i<n; i++) {
         UErrorCode status = U_ZERO_ERROR;
         UParseError parseError;
@@ -1097,7 +1097,7 @@ void TransliteratorTest::TestHiraganaKatakana(void) {
         "\\u307C\\u3051\\u3060\\u3042\\u3093\\u30FC",
         "\\u30DC\\u30F6\\u30C0\\u30FC\\u30F3\\u30FC",
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; i+=3) {
         UnicodeString h = CharsToUnicodeString(DATA[i+1]);
@@ -1189,7 +1189,7 @@ void TransliteratorTest::TestFilterIDs(void) {
         "xyz",
         "xyz",
     };
-    enum { DATA_length = sizeof(DATA) / sizeof(DATA[0]) };
+    enum { DATA_length = UPRV_LENGTHOF(DATA) };
 
     for (int i=0; i<DATA_length; i+=4) {
         UnicodeString ID(DATA[i], "");
@@ -1313,7 +1313,7 @@ void TransliteratorTest::TestLiberalizedID(void) {
         " Latin[a-z]-Greek  ", "[a-z]Latin-Greek", "inline filter",
         "  null  ; latin-greek  ", NULL /*"Null;Latin-Greek"*/, "compound whitespace",
     };
-    const int32_t DATA_length = sizeof(DATA)/sizeof(DATA[0]);
+    const int32_t DATA_length = UPRV_LENGTHOF(DATA);
     UParseError parseError;
     UErrorCode status= U_ZERO_ERROR;
     for (int32_t i=0; i<DATA_length; i+=3) {
@@ -1728,7 +1728,7 @@ void TransliteratorTest::TestToRules(void) {
         "([AEIOUYaeiouy]\\u0304[[:M:]-[\\u0304\\u0345]]*)i > | $1 \\u0345;",
         "([AEIOUYaeiouy]\\u0304[[:M:]-[\\u0304\\u0345]]*)i > | $1 \\u0345;",
     };
-    static const int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
+    static const int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t d=0; d < DATA_length; d+=3) {
         if (DATA[d] == RBT) {
@@ -2786,7 +2786,7 @@ void TransliteratorTest::TestCompoundLatinRT(){
         "kimakurvata",
         "san\\u0304java"
     };
-    const int MAX_LEN = sizeof(source)/sizeof(source[0]);
+    const int MAX_LEN = UPRV_LENGTHOF(source);
     const char* const expected[MAX_LEN] = {
         "\\u0930\\u094D\\u092E\\u094D\\u0915\\u094D\\u0937\\u0947\\u0924\\u094D",
         "\\u0936\\u094d\\u0930\\u0940\\u092e\\u0926\\u094d",
@@ -2806,7 +2806,7 @@ void TransliteratorTest::TestCompoundLatinRT(){
         "\\u0915\\u093f\\u092e\\u0915\\u0941\\u0930\\u094d\\u0935\\u0924",
         "\\u0938\\u0902\\u091c\\u0935"
     };
-    if(MAX_LEN != sizeof(expected)/sizeof(expected[0])) {
+    if(MAX_LEN != UPRV_LENGTHOF(expected)) {
         errln("error in TestCompoundLatinRT: source[] and expected[] have different lengths!");
         return;
     }
@@ -2932,7 +2932,7 @@ void TransliteratorTest::TestLocaleResource() {
         "el-Latin",              "\\u03B2",         "v",
         "Greek-Latin",           "\\u03B2",         "b",
     };
-    const int32_t DATA_length = sizeof(DATA) / sizeof(DATA[0]);
+    const int32_t DATA_length = UPRV_LENGTHOF(DATA);
     for (int32_t i=0; i<DATA_length; i+=3) {
         UParseError pe;
         UErrorCode ec = U_ZERO_ERROR;
@@ -3072,7 +3072,7 @@ void TransliteratorTest::TestIDForms() {
         "-", NULL, NULL,
         "/", NULL, NULL,
     };
-    const int32_t DATA_length = sizeof(DATA)/sizeof(DATA[0]);
+    const int32_t DATA_length = UPRV_LENGTHOF(DATA);
     
     for (int32_t i=0; i<DATA_length; i+=3) {
         const char* ID = DATA[i];
@@ -3288,7 +3288,7 @@ void TransliteratorTest::TestDisplayName() {
         "NFC", "Any to NFC", "Any to NFD",
     };
 
-    int32_t DATA_length = sizeof(DATA) / sizeof(DATA[0]);
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
     
     Locale US("en", "US");
     
@@ -4305,7 +4305,7 @@ static const char* BOGUS_BEGIN_END_RULES[] = {
     "::Upper;"
     "::END;"
 };
-static const int32_t BOGUS_BEGIN_END_RULES_length = (int32_t)(sizeof(BOGUS_BEGIN_END_RULES) / sizeof(BOGUS_BEGIN_END_RULES[0]));
+static const int32_t BOGUS_BEGIN_END_RULES_length = UPRV_LENGTHOF(BOGUS_BEGIN_END_RULES);
 */
 
 static const char* BEGIN_END_TEST_CASES[] = {
@@ -4335,7 +4335,7 @@ static const char* BEGIN_END_TEST_CASES[] = {
 //    BEGIN_END_RULES[16], "abc xy ababc xyz aba", "XY xy ABXY xyz YZ",
     BEGIN_END_RULES[17], "abc xy ababc xyz aba", "XY xy ABXY xyz YZ"
 };
-static const int32_t BEGIN_END_TEST_CASES_length = (int32_t)(sizeof(BEGIN_END_TEST_CASES) / sizeof(BEGIN_END_TEST_CASES[0]));
+static const int32_t BEGIN_END_TEST_CASES_length = UPRV_LENGTHOF(BEGIN_END_TEST_CASES);
 
 void TransliteratorTest::TestBeginEnd() {
     // run through the list of test cases above
@@ -4522,9 +4522,9 @@ void TransliteratorTest::TestRuleStripping() {
     static const UChar expectedRule[] = {
         0xE001,0x003E,0x0C01,0x003B,0
     };
-    UChar result[sizeof(rule)/sizeof(rule[0])];
+    UChar result[UPRV_LENGTHOF(rule)];
     UErrorCode status = U_ZERO_ERROR;
-    int32_t len = utrans_stripRules(rule, (int32_t)(sizeof(rule)/sizeof(rule[0])), result, &status);
+    int32_t len = utrans_stripRules(rule, UPRV_LENGTHOF(rule), result, &status);
     if (len != u_strlen(expectedRule)) {
         errln("utrans_stripRules return len = %d", len);
     }
@@ -4558,7 +4558,7 @@ void TransliteratorTest::TestHalfwidthFullwidth(void) {
         "\\uFFE9\\uFFEA\\uFFEB\\uFFEC\\u0061\\uFF71\\u00AF\\u0020",
         "\\u2190\\u2191\\u2192\\u2193\\uFF41\\u30A2\\uFFE3\\u3000",
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; i+=3) {
         UnicodeString h = CharsToUnicodeString(DATA[i+1]);