ICU 56 update step 1

source/test/cintltst/currtest.c

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 2005-2014, International Business Machines Corporation and
+ * Copyright (c) 2005-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 #include "unicode/unum.h"
 #include "unicode/ucurr.h"
 #include "unicode/ustring.h"
 #include "cintltst.h"
 #include "cstring.h"
@@ skipping 138 matching lines @@
     if (checkItemCount(UCURR_COMMON|UCURR_UNCOMMON) != 0) {
         log_err("Error: UCURR_DEPRECATED|UCURR_NON_DEPRECATED should return 0 items\n");
     }
 }
 
 static void TestFractionDigitOverride(void) {
     UErrorCode status = U_ZERO_ERROR;
     UNumberFormat *fmt = unum_open(UNUM_CURRENCY, NULL, 0, "hu_HU", NULL, &status);
     UChar buffer[256];
     UChar expectedBuf[256];
-    const char expectedFirst[] = "123,46\\u00A0HUF"; /* changed to use 2 fraction digits */
-    const char expectedSecond[] = "123,46\\u00A0HUF";
-    const char expectedThird[] = "123,456\\u00A0HUF";
+    const char expectedFirst[] = "123,46\\u00A0Ft"; /* changed to use 2 fraction digits */
+    const char expectedSecond[] = "123,46\\u00A0Ft";
+    const char expectedThird[] = "123,456\\u00A0Ft";
     if (U_FAILURE(status)) {
        log_data_err("Error: unum_open returned %s (Are you missing data?)\n", myErrorName(status));
        return;
     }
     /* Make sure that you can format normal fraction digits. */
     unum_formatDouble(fmt, 123.456, buffer, sizeof(buffer)/sizeof(buffer[0]), NULL, &status);
     u_unescape(expectedFirst, expectedBuf, strlen(expectedFirst)+1);
     if (u_strcmp(buffer, expectedBuf) != 0) {
        log_err("Error: unum_formatDouble didn't return %s\n", expectedFirst);
     }
@@ skipping 62 matching lines @@
     {"Usd", 840},   /* mixed casing */
     {"EUR", 978},
     {"JPY", 392},
     {"XFU", 0},     /* XFU: no numeric code  */
     {"ZZZ", 0},     /* ZZZ: undefined ISO currency code */
     {"bogus", 0},   /* bogus code */
     {0, 0},
 };
 
 static void TestNumericCode(void) {
-    UChar code[4];
+    UChar code[8];  // at least one longer than the longest alphaCode
     int32_t i;
     int32_t numCode;
 
     for (i = 0; NUMCODE_TESTDATA[i].alphaCode; i++) {
-        u_charsToUChars(NUMCODE_TESTDATA[i].alphaCode, code, sizeof(code)/sizeof(code[0]));
+        int32_t length = uprv_strlen(NUMCODE_TESTDATA[i].alphaCode);
+        u_charsToUChars(NUMCODE_TESTDATA[i].alphaCode, code, length + 1);  // +1 includes the NUL
         numCode = ucurr_getNumericCode(code);
         if (numCode != NUMCODE_TESTDATA[i].numericCode) {
             log_data_err("Error: ucurr_getNumericCode returned %d for currency %s, expected - %d\n",
                 numCode, NUMCODE_TESTDATA[i].alphaCode, NUMCODE_TESTDATA[i].numericCode);
         }
     }
 }
 
 void addCurrencyTest(TestNode** root);
 
 #define TESTCASE(x) addTest(root, &x, "tsformat/currtest/" #x)
 
 void addCurrencyTest(TestNode** root)
 {
     TESTCASE(TestEnumList);
     TESTCASE(TestEnumListReset);
     TESTCASE(TestEnumListCount);
     TESTCASE(TestFractionDigitOverride);
     TESTCASE(TestPrefixSuffix);
     TESTCASE(TestNumericCode);
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */