Update ICU to 54.1 step 1

source/test/intltest/transtst.cpp

 /*
 **********************************************************************
-*   Copyright (C) 1999-2013, International Business Machines
+*   Copyright (C) 1999-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
 *   11/10/99    aliu        Creation.
 **********************************************************************
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_TRANSLITERATION
@@ skipping 177 matching lines @@
         TESTCASE(79,TestBeginEndToRules);
         TESTCASE(80,TestRegisterAlias);
         TESTCASE(81,TestRuleStripping);
         TESTCASE(82,TestHalfwidthFullwidth);
         TESTCASE(83,TestThai);
         TESTCASE(84,TestAny);
         default: name = ""; break;
     }
 }
 
-static const UVersionInfo ICU_39 = {3,9,4,0};
 /**
  * Make sure every system transliterator can be instantiated.
  * 
  * ALSO test that the result of toRules() for each rule is a valid
  * rule.  Do this here so we don't have to have another test that
  * instantiates everything as well.
  */
 void TransliteratorTest::TestInstantiation() {
     UErrorCode ec = U_ZERO_ERROR;
     StringEnumeration* avail = Transliterator::getAvailableIDs(ec);
@@ skipping 1259 matching lines @@
         UnicodeString expc = CharsToUnicodeString(CANON[i+2]);
         expect(*NFD, in, expd);
         expect(*NFC, in, expc);
     }
     delete NFD;
     delete NFC;
 
     Transliterator* NFKD = Transliterator::createInstance("NFKD", UTRANS_FORWARD, parseError, status);
     Transliterator* NFKC = Transliterator::createInstance("NFKC", UTRANS_FORWARD, parseError, status);
     if (!NFKD || !NFKC) {
-        errln("FAIL: createInstance failed");
+        dataerrln("FAIL: createInstance failed");
         delete NFKD;
         delete NFKC;
         return;
     }
     for (i=0; COMPAT[i]; i+=3) {
         UnicodeString in = CharsToUnicodeString(COMPAT[i]);
         UnicodeString expkd = CharsToUnicodeString(COMPAT[i+1]);
         UnicodeString expkc = CharsToUnicodeString(COMPAT[i+2]);
         expect(*NFKD, in, expkd);
         expect(*NFKC, in, expkc);
@@ skipping 2784 matching lines @@
     "", // test case commented out below, this is here to keep from messing up the indexes
 
     // [17]
     "::[abc];"
     "abc <> xy;"
     "::Null;"
     "aba <> yz;"
     "::Upper(Lower);"
     "::([XYZ]);"
 };
-static const int32_t BEGIN_END_RULES_length = (int32_t)(sizeof(BEGIN_END_RULES) / sizeof(BEGIN_END_RULES[0]));
 
 /*
 (This entire test is commented out below and will need some heavy revision when we re-add
 the ::BEGIN/::END stuff)
 static const char* BOGUS_BEGIN_END_RULES[] = {
     // [7]
     "::BEGIN;"
     "abc > xy;"
     "::BEGIN;"
     "aba > z;"
@@ skipping 539 matching lines @@
     if (pass) {
         logln(UnicodeString("(")+tag+") " + prettify(summary));
     } else {
         dataerrln(UnicodeString("FAIL: (")+tag+") "
               + prettify(summary)
               + ", expected " + prettify(expectedResult));
     }
 }
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */