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

source/test/intltest/measfmttest.cpp

 /*
 *******************************************************************************
 * Copyright (C) 2014-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File MEASFMTTEST.CPP
 *
 *******************************************************************************
 */
@@ skipping 43 matching lines @@
     void TestMultiples();
     void TestGram();
     void TestCurrencies();
     void TestFieldPosition();
     void TestFieldPositionMultiple();
     void TestBadArg();
     void TestEquality();
     void TestGroupingSeparator();
     void TestDoubleZero();
     void TestUnitPerUnitResolution();
+    void TestIndividualPluralFallback();
     void verifyFormat(
         const char *description,
         const MeasureFormat &fmt,
         const Measure *measures,
         int32_t measureCount,
         const char *expected);
     void verifyFormatWithPrefix(
         const char *description,
         const MeasureFormat &fmt,
         const UnicodeString &prefix,
@@ skipping 60 matching lines @@
     TESTCASE_AUTO(TestMultiples);
     TESTCASE_AUTO(TestGram);
     TESTCASE_AUTO(TestCurrencies);
     TESTCASE_AUTO(TestFieldPosition);
     TESTCASE_AUTO(TestFieldPositionMultiple);
     TESTCASE_AUTO(TestBadArg);
     TESTCASE_AUTO(TestEquality);
     TESTCASE_AUTO(TestGroupingSeparator);
     TESTCASE_AUTO(TestDoubleZero);
     TESTCASE_AUTO(TestUnitPerUnitResolution);
+    TESTCASE_AUTO(TestIndividualPluralFallback);
     TESTCASE_AUTO_END;
 }
 
 void MeasureFormatTest::TestCompatible53_1() {
     UErrorCode status = U_ZERO_ERROR;
     LocalPointer<MeasureUnit> measureUnit;
     measureUnit.adoptInstead(MeasureUnit::createGForce(status));
     measureUnit.adoptInstead(MeasureUnit::createArcMinute(status));
     measureUnit.adoptInstead(MeasureUnit::createArcSecond(status));
     measureUnit.adoptInstead(MeasureUnit::createDegree(status));
@@ skipping 1427 matching lines @@
     UnicodeString actual;
     fmt.formatMeasurePerUnit(
             measure,
             *sqInch,
             actual,
             pos,
             status);
     assertEquals("", "50 psi", actual);
 }
 
+void MeasureFormatTest::TestIndividualPluralFallback() {
+    // See ticket #11986 "incomplete fallback in MeasureFormat".
+    // In CLDR 28, fr_CA temperature-generic/short has only the "one" form,
+    // and falls back to fr for the "other" form.
+    IcuTestErrorCode errorCode(*this, "TestIndividualPluralFallback");
+    MeasureFormat mf("fr_CA", UMEASFMT_WIDTH_SHORT, errorCode);
+    LocalPointer<Measure> twoDeg(
+        new Measure(2, MeasureUnit::createGenericTemperature(errorCode), errorCode), errorCode);
+    UnicodeString expected = UNICODE_STRING_SIMPLE("2\\u00B0").unescape();
+    UnicodeString actual;
+    assertEquals("2 deg temp in fr_CA", expected, mf.format(twoDeg.orphan(), actual, errorCode));
+}
+
 void MeasureFormatTest::verifyFieldPosition(
         const char *description,
         const MeasureFormat &fmt,
         const UnicodeString &prefix,
         const Measure *measures,
         int32_t measureCount,
         NumberFormat::EAlignmentFields field,
         int32_t start,
         int32_t end) {
     // 8 char lead
@@ skipping 56 matching lines @@
         verifyFormat(description, fmt, expectedResults[i].measures, expectedResults[i].count, expectedResults[i].expected);
     }
 }
 
 extern IntlTest *createMeasureFormatTest() {
     return new MeasureFormatTest();
 }
 
 #endif