Update ICU to 54.1 step 1

source/test/intltest/compactdecimalformattest.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2013, International Business Machines Corporation and    *
+* Copyright (C) 1997-2014, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File COMPACTDECIMALFORMATTEST.CPP
 *
 ********************************************************************************
 */
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "intltest.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/compactdecimalformat.h"
 #include "unicode/unum.h"
-
-#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
+#include "cmemory.h"
 
 typedef struct ExpectedResult {
   double value;
   const char *expected;
 } ExpectedResult;
 
 static const char *kShortStr = "Short";
 static const char *kLongStr = "Long";
 
 static ExpectedResult kEnglishShort[] = {
   {0.0, "0"},
   {0.17, "0.17"},
   {1.0, "1"},
   {1234.0, "1.2K"},
   {12345.0, "12K"},
   {123456.0, "120K"},
   {1234567.0, "1.2M"},
   {12345678.0, "12M"},
   {123456789.0, "120M"},
   {1.23456789E9, "1.2B"},
   {1.23456789E10, "12B"},
   {1.23456789E11, "120B"},
   {1.23456789E12, "1.2T"},
   {1.23456789E13, "12T"},
   {1.23456789E14, "120T"},
   {1.23456789E15, "1200T"}};
 
 static ExpectedResult kSerbianShort[] = {
-  {1234.0, "1200"},
-  {12345.0, "12\\u00a0\\u0445\\u0438\\u0459"},
-  {20789.0, "21\\u00a0\\u0445\\u0438\\u0459"},
-  {123456.0, "120\\u00a0\\u0445\\u0438\\u0459"},
-  {1234567.0, "1,2\\u00A0\\u043C\\u0438\\u043B"},
-  {12345678.0, "12\\u00A0\\u043C\\u0438\\u043B"},
-  {123456789.0, "120\\u00A0\\u043C\\u0438\\u043B"},
-  {1.23456789E9, "1,2\\u00A0\\u043C\\u043B\\u0440\\u0434"},
-  {1.23456789E10, "12\\u00A0\\u043C\\u043B\\u0440\\u0434"},
-  {1.23456789E11, "120\\u00A0\\u043C\\u043B\\u0440\\u0434"},
-  {1.23456789E12, "1,2\\u00A0\\u0431\\u0438\\u043B"},
-  {1.23456789E13, "12\\u00A0\\u0431\\u0438\\u043B"},
-  {1.23456789E14, "120\\u00A0\\u0431\\u0438\\u043B"},
-  {1.23456789E15, "1200\\u00A0\\u0431\\u0438\\u043B"}};
+  {1234.0, "1,2\\u00a0\\u0445\\u0438\\u0459."},
+  {12345.0, "12\\u00a0\\u0445\\u0438\\u0459."},
+  {20789.0, "21\\u00a0\\u0445\\u0438\\u0459."},
+  {123456.0, "120\\u00a0\\u0445\\u0438\\u0459."},
+  {1234567.0, "1,2\\u00A0\\u043C\\u0438\\u043B."},
+  {12345678.0, "12\\u00A0\\u043C\\u0438\\u043B."},
+  {123456789.0, "120\\u00A0\\u043C\\u0438\\u043B."},
+  {1.23456789E9, "1,2\\u00A0\\u043C\\u043B\\u0440\\u0434."},
+  {1.23456789E10, "12\\u00A0\\u043C\\u043B\\u0440\\u0434."},
+  {1.23456789E11, "120\\u00A0\\u043C\\u043B\\u0440\\u0434."},
+  {1.23456789E12, "1,2\\u00A0\\u0431\\u0438\\u043B."},
+  {1.23456789E13, "12\\u00A0\\u0431\\u0438\\u043B."},
+  {1.23456789E14, "120\\u00A0\\u0431\\u0438\\u043B."},
+  {1.23456789E15, "1200\\u00A0\\u0431\\u0438\\u043B."}};
 
 static ExpectedResult kSerbianLong[] = {
   {1234.0, "1,2 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"}, // 10^3 few
   {12345.0, "12 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"}, // 10^3 other
   {21789.0, "22 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0435"}, // 10^3 few
   {123456.0, "120 \\u0445\\u0438\\u0459\\u0430\\u0434\\u0430"}, // 10^3 other
   {999999.0, "1 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D"}, // 10^6 one
   {1234567.0, "1,2 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}, // 10^6 few
   {12345678.0, "12 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}, // 10^6 other
   {123456789.0, "120 \\u043C\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}, // 10^6 other
@@ skipping 36 matching lines @@
   {1.23456789E9, "12\\u5104"},
   {1.23456789E10, "120\\u5104"},
   {1.23456789E11, "1200\\u5104"},
   {1.23456789E12, "1.2\\u5146"},
   {1.23456789E13, "12\\u5146"},
   {1.23456789E14, "120\\u5146"}};
 
 static ExpectedResult kSwahiliShort[] = {
   {1234.0, "elfu\\u00a01.2"},
   {12345.0, "elfu\\u00a012"},
-  {123456.0, "laki1.2"},
+  {123456.0, "elfu\\u00a0120"},
   {1234567.0, "M1.2"},
   {12345678.0, "M12"},
   {123456789.0, "M120"},
   {1.23456789E9, "B1.2"},
   {1.23456789E10, "B12"},
   {1.23456789E11, "B120"},
   {1.23456789E12, "T1.2"},
   {1.23456789E13, "T12"},
   {1.23456789E15, "T1200"}};
 
@@ skipping 14 matching lines @@
   {1.27123456E14, "130\\u00a0bil."}};
 
 static ExpectedResult kSkLong[] = {
   {1000.0, "1 tis\\u00edc"},
   {1572.0, "1,6 tis\\u00edc"},
   {5184.0, "5,2 tis\\u00edc"}};
 
 static ExpectedResult kSwahiliShortNegative[] = {
   {-1234.0, "elfu\\u00a0-1.2"},
   {-12345.0, "elfu\\u00a0-12"},
-  {-123456.0, "laki-1.2"},
+  {-123456.0, "elfu\\u00a0-120"},
   {-1234567.0, "M-1.2"},
   {-12345678.0, "M-12"},
   {-123456789.0, "M-120"},
   {-1.23456789E9, "B-1.2"},
   {-1.23456789E10, "B-12"},
   {-1.23456789E11, "B-120"},
   {-1.23456789E12, "T-1.2"},
   {-1.23456789E13, "T-12"},
   {-1.23456789E15, "T-1200"}};
 
@@ skipping 45 matching lines @@
   TESTCASE_AUTO(TestCsShort);
   TESTCASE_AUTO(TestSkLong);
   TESTCASE_AUTO(TestSwahiliShortNegative);
   TESTCASE_AUTO(TestArabicLong);
   TESTCASE_AUTO(TestFieldPosition);
   TESTCASE_AUTO(TestSignificantDigits);
   TESTCASE_AUTO_END;
 }
 
 void CompactDecimalFormatTest::TestEnglishShort() {
-  CheckLocale("en", UNUM_SHORT, kEnglishShort, LENGTHOF(kEnglishShort));
+  CheckLocale("en", UNUM_SHORT, kEnglishShort, UPRV_LENGTHOF(kEnglishShort));
 }
 
 void CompactDecimalFormatTest::TestSerbianShort() {
-  CheckLocale("sr", UNUM_SHORT, kSerbianShort, LENGTHOF(kSerbianShort));
+  CheckLocale("sr", UNUM_SHORT, kSerbianShort, UPRV_LENGTHOF(kSerbianShort));
 }
 
 void CompactDecimalFormatTest::TestSerbianLong() {
-  CheckLocale("sr", UNUM_LONG, kSerbianLong, LENGTHOF(kSerbianLong));
+  CheckLocale("sr", UNUM_LONG, kSerbianLong, UPRV_LENGTHOF(kSerbianLong));
 }
 
 void CompactDecimalFormatTest::TestSerbianLongNegative() {
-  CheckLocale("sr", UNUM_LONG, kSerbianLongNegative, LENGTHOF(kSerbianLongNegative));
+  CheckLocale("sr", UNUM_LONG, kSerbianLongNegative, UPRV_LENGTHOF(kSerbianLongNegative));
 }
 
 void CompactDecimalFormatTest::TestJapaneseShort() {
-  CheckLocale(Locale::getJapan(), UNUM_SHORT, kJapaneseShort, LENGTHOF(kJapaneseShort));
+  CheckLocale(Locale::getJapan(), UNUM_SHORT, kJapaneseShort, UPRV_LENGTHOF(kJapaneseShort));
 }
 
 void CompactDecimalFormatTest::TestSwahiliShort() {
-  CheckLocale("sw", UNUM_SHORT, kSwahiliShort, LENGTHOF(kSwahiliShort));
+  CheckLocale("sw", UNUM_SHORT, kSwahiliShort, UPRV_LENGTHOF(kSwahiliShort));
 }
 
 void CompactDecimalFormatTest::TestFieldPosition() {
   // Swahili uses prefixes which forces offsets in field position to change
   UErrorCode status = U_ZERO_ERROR;
   LocalPointer<CompactDecimalFormat> cdf(createCDFInstance("sw", UNUM_SHORT, status));
   if (U_FAILURE(status)) {
     dataerrln("Unable to create format object - %s", u_errorName(status));
     return;
   }
   FieldPosition fp(UNUM_INTEGER_FIELD);
   UnicodeString result;
   cdf->format(1234567.0, result, fp);
   UnicodeString subString = result.tempSubString(fp.getBeginIndex(), fp.getEndIndex() - fp.getBeginIndex());
   if (subString != UnicodeString("1", -1, US_INV)) {
     errln(UnicodeString("Expected 1, got ") + subString);
   }
 }
 
 void CompactDecimalFormatTest::TestCsShort() {
-  CheckLocale("cs", UNUM_SHORT, kCsShort, LENGTHOF(kCsShort));
+  CheckLocale("cs", UNUM_SHORT, kCsShort, UPRV_LENGTHOF(kCsShort));
 }
 
 void CompactDecimalFormatTest::TestSkLong() {
   // In CLDR we have:
   // 1000 {
   //   few{"0"}
   //   one{"0"}
   //   other{"0"}
-  CheckLocale("sk", UNUM_LONG, kSkLong, LENGTHOF(kSkLong));
+  CheckLocale("sk", UNUM_LONG, kSkLong, UPRV_LENGTHOF(kSkLong));
 }
 
 void CompactDecimalFormatTest::TestSwahiliShortNegative() {
-  CheckLocale("sw", UNUM_SHORT, kSwahiliShortNegative, LENGTHOF(kSwahiliShortNegative));
+  CheckLocale("sw", UNUM_SHORT, kSwahiliShortNegative, UPRV_LENGTHOF(kSwahiliShortNegative));
 }
 
 void CompactDecimalFormatTest::TestArabicLong() {
-  CheckLocale("ar", UNUM_LONG, kArabicLong, LENGTHOF(kArabicLong));
+  CheckLocale("ar", UNUM_LONG, kArabicLong, UPRV_LENGTHOF(kArabicLong));
 }
 
 void CompactDecimalFormatTest::TestSignificantDigits() {
   UErrorCode status = U_ZERO_ERROR;
   LocalPointer<CompactDecimalFormat> cdf(CompactDecimalFormat::createInstance("en", UNUM_SHORT, status));
   if (U_FAILURE(status)) {
     dataerrln("Unable to create format object - %s", u_errorName(status));
     return;
   }
   UnicodeString actual;
@@ skipping 49 matching lines @@
     return kShortStr;
   }
   return kLongStr;
 }
 
 extern IntlTest *createCompactDecimalFormatTest() {
   return new CompactDecimalFormatTest();
 }
 
 #endif