ICU 56 update step 1

source/test/intltest/tmsgfmt.cpp

 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, 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
@@ skipping 1504 matching lines @@
         // decimal values do not format completely for ordinal or duration, and 
         // do not always parse, so do not include them
         "0", "1", "12", "100", "123", "1001", "123,456", "-17",
     };
     int32_t values_count = sizeof(values)/sizeof(values[0]);
 
     UnicodeString formats[] = {
         "There are {0,spellout} files to search.",
         "There are {0,spellout,%simplified} files to search.",
         "The bogus spellout {0,spellout,%BOGUS} files behaves like the default.",
-        "This is the {0,ordinal} file to search.", // TODO fix bug, ordinal does not parse
+        "This is the {0,ordinal} file to search.",
         "Searching this file will take {0,duration} to complete.",
         "Searching this file will take {0,duration,%with-words} to complete.",
     };
     int32_t formats_count = sizeof(formats)/sizeof(formats[0]);
 
     Formattable args[1];
 
     NumberFormat* numFmt = NumberFormat::createInstance(locale, ec);
     if (U_FAILURE(ec)) {
         dataerrln("Error calling NumberFormat::createInstance()");
         return;
     }
 
     for (int i = 0; i < formats_count; ++i) {
         MessageFormat* fmt = new MessageFormat(formats[i], locale, ec);
         logln((UnicodeString)"Testing format pattern: '" + formats[i] + "'");
 
         for (int j = 0; j < values_count; ++j) {
             ec = U_ZERO_ERROR;
             numFmt->parse(values[j], args[0], ec);
             if (U_FAILURE(ec)) {
                 errln((UnicodeString)"Failed to parse test argument " + values[j]);
             } else {
                 FieldPosition fp(0);
                 UnicodeString result;
                 fmt->format(args, 1, result, fp, ec);
                 logln((UnicodeString)"value: " + toString(args[0]) + " --> " + result + UnicodeString(" ec: ") + u_errorName(ec));
                
-                if (i != 3) { // TODO: fix this, for now skip ordinal parsing (format string at index 3)
-                    int32_t count = 0;
-                    Formattable* parseResult = fmt->parse(result, count, ec);
-                    if (count != 1) {
-                        errln((UnicodeString)"parse returned " + count + " args");
-                    } else if (parseResult[0] != args[0]) {
-                        errln((UnicodeString)"parsed argument " + toString(parseResult[0]) + " != " + toString(args[0]));
-                    }
-                    delete []parseResult;
+                int32_t count = 0;
+                Formattable* parseResult = fmt->parse(result, count, ec);
+                if (count != 1) {
+                    errln((UnicodeString)"parse returned " + count + " args");
+                } else if (parseResult[0] != args[0]) {
+                    errln((UnicodeString)"parsed argument " + toString(parseResult[0]) + " != " + toString(args[0]));
                 }
+                delete []parseResult;
             }
         }
         delete fmt;
     }
     delete numFmt;
 }
 
 UnicodeString TestMessageFormat::GetPatternAndSkipSyntax(const MessagePattern& pattern) {
     UnicodeString us(pattern.getPatternString());
     int count = pattern.countParts();
@@ skipping 380 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 */