Update ICU to 54.1 step 1

source/test/intltest/tmsgfmt.cpp

 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2013, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************
  * File TMSGFMT.CPP
  *
  * Modification History:
  *
  *   Date        Name        Description
  *   03/24/97    helena      Converted from Java.
  *   07/11/97    helena      Updated to work on AIX.
  *   08/04/97    jfitz       Updated to intltest
  *******************************************************************/
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "tmsgfmt.h"
+#include "cmemory.h"
 
 #include "unicode/format.h"
 #include "unicode/decimfmt.h"
 #include "unicode/localpointer.h"
 #include "unicode/locid.h"
 #include "unicode/msgfmt.h"
 #include "unicode/numfmt.h"
 #include "unicode/choicfmt.h"
 #include "unicode/messagepattern.h"
 #include "unicode/selfmt.h"
 #include "unicode/gregocal.h"
 #include <stdio.h>
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 void
 TestMessageFormat::runIndexedTest(int32_t index, UBool exec,
                                   const char* &name, char* /*par*/) {
     TESTCASE_AUTO_BEGIN;
     TESTCASE_AUTO(testBug1);
     TESTCASE_AUTO(testBug2);
     TESTCASE_AUTO(sample);
     TESTCASE_AUTO(PatternTest);
     TESTCASE_AUTO(testStaticFormat);
     TESTCASE_AUTO(testSimpleFormat);
@@ skipping 1553 matching lines @@
     UnicodeString tuples[] = {
         // Desired output
         // DOUBLE_OPTIONAL pattern
         // DOUBLE_REQUIRED pattern (empty=same as DOUBLE_OPTIONAL)
         "I see {many}", "I see '{many}'", "",
         "I said {'Wow!'}", "I said '{''Wow!''}'", "",
         "I dont know", "I dont know", "I don't know",
         "I don't know", "I don't know", "I don''t know",
         "I don't know", "I don''t know", "I don''t know"
     };
-    int32_t tuples_count = LENGTHOF(tuples);
+    int32_t tuples_count = UPRV_LENGTHOF(tuples);
 
     for (int i = 0; i < tuples_count; i += 3) {
       UnicodeString& desired = tuples[i];
       UnicodeString& ado_pattern = tuples[i + 1];
       UErrorCode status = U_ZERO_ERROR;
       assertEquals("DOUBLE_OPTIONAL failure",
                    desired,
                    GetPatternAndSkipSyntax(ado_mp->parse(ado_pattern, NULL, status)));
       UnicodeString& adr_pattern = tuples[i + 2].isEmpty() ? ado_pattern : tuples[i + 2];
       assertEquals("DOUBLE_REQUIRED failure", desired,
@@ skipping 338 matching lines @@
             m2.format(args, 1, result, ignore, errorCode), TRUE);
 
     args[0] = (double)2.5;
     result.remove();
     assertEquals("offset-decimals format(1)", "2.5 meters",
             m2.format(args, 1, result, ignore, errorCode), TRUE);
     errorCode.reset();
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */