ICU 56 step 4: Apply post-56 fixes for measure/date format

source/test/intltest/quantityformattertest.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2014, International Business Machines Corporation and         *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 2014-2015, International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 *
 * File QUANTITYFORMATTERTEST.CPP
 *
 ********************************************************************************
 */
 #include "cstring.h"
 #include "intltest.h"
 #include "quantityformatter.h"
 #include "simplepatternformatter.h"
@@ skipping 15 matching lines @@
   TESTCASE_AUTO(TestBasic);
   TESTCASE_AUTO_END;
 }
 
 void QuantityFormatterTest::TestBasic() {
     UErrorCode status = U_ZERO_ERROR;
 #if !UCONFIG_NO_FORMATTING
     QuantityFormatter fmt;
     assertFalse(
             "adding bad variant",
-            fmt.add("a bad variant", "{0} pounds", status));
+            fmt.addIfAbsent("a bad variant", "{0} pounds", status));
     assertEquals("adding bad variant status", U_ILLEGAL_ARGUMENT_ERROR, status);
     status = U_ZERO_ERROR;
     assertFalse(
             "Adding bad pattern",
-            fmt.add("other", "{0} {1} too many placeholders", status));
+            fmt.addIfAbsent("other", "{0} {1} too many placeholders", status));
     assertEquals("adding bad pattern status", U_ILLEGAL_ARGUMENT_ERROR, status);
     status = U_ZERO_ERROR;
     assertFalse("isValid with no patterns", fmt.isValid());
     assertTrue(
             "Adding good pattern with no placeholders",
-            fmt.add("other", "no placeholder", status));
+            fmt.addIfAbsent("zero", "no placeholder", status));
     assertTrue(
             "Adding good pattern",
-            fmt.add("other", "{0} pounds", status));
+            fmt.addIfAbsent("other", "{0} pounds", status));
     assertTrue("isValid with other", fmt.isValid());
     assertTrue(
             "Adding good pattern",
-            fmt.add("one", "{0} pound", status));
+            fmt.addIfAbsent("one", "{0} pound", status));
 
     assertEquals(
             "getByVariant",
             fmt.getByVariant("bad variant")->getPatternWithNoPlaceholders(),
             " pounds");
     assertEquals(
             "getByVariant",
             fmt.getByVariant("other")->getPatternWithNoPlaceholders(),
             " pounds");
     assertEquals(
@@ skipping 72 matching lines @@
     }
     fmt.reset();
     assertFalse("isValid after reset", fmt.isValid());
 #endif
     assertSuccess("", status);
 }
 
 extern IntlTest *createQuantityFormatterTest() {
     return new QuantityFormatterTest();
 }