ICU-11740 Attempt to fix broken build.

X-SVN-Rev: 37827

diff --git a/icu4c/source/i18n/affixpatternparser.h b/icu4c/source/i18n/affixpatternparser.h
index f38d64a78852c2d8d0735bd9c438b459af8b6a41..b35dcc039077557b15d01ea4f07fba802c385260 100644 (file)
--- a/icu4c/source/i18n/affixpatternparser.h
+++ b/icu4c/source/i18n/affixpatternparser.h
@@ -128,7 +128,7 @@ public:
         kPerMill,
         kCurrency,
         kNegative,
-        kPositive,
+        kPositive
     };
 
     /**

diff --git a/icu4c/source/test/intltest/numberformat2test.cpp b/icu4c/source/test/intltest/numberformat2test.cpp
index 08588d28ddad0cd7bc55fa70ab2ad0846c6392f7..8a7ecef0e091ca23858e7f732ae65e52c8cf67c6 100644 (file)
--- a/icu4c/source/test/intltest/numberformat2test.cpp
+++ b/icu4c/source/test/intltest/numberformat2test.cpp
@@ -1508,9 +1508,10 @@ void NumberFormat2Test::TestAffixPatternParser() {
     affixPattern.toString(formattedStr);
     UnicodeString expectedFormattedStr("'--y''dz'%'\\u00a4\\u00a4\\u00a4\\u00a4 y '\\u00a4\\u00a4\\u00a4 or '\\u00a4\\u00a4 but '\\u00a4");
     expectedFormattedStr = expectedFormattedStr.unescape();
-    assertEquals("", expectedFormattedStr, formattedStr);
+    assertEquals("1", expectedFormattedStr, formattedStr);
     AffixPattern userAffixPattern;
     UnicodeString userStr("-'-'y'''d'z%\\u00a4\\u00a4\\u00a4'\\u00a4' y \\u00a4\\u00a4\\u00a4 or \\u00a4\\u00a4 but \\u00a4");
+    userStr = userStr.unescape();
     AffixPattern::parseUserAffixString(userStr, userAffixPattern, status),
     assertTrue("", affixPattern.equals(userAffixPattern));
     AffixPattern userAffixPattern2;
@@ -1521,7 +1522,7 @@ void NumberFormat2Test::TestAffixPatternParser() {
             status);
     UnicodeString expectedFormattedUserStr(
             "-'-'y''dz%\\u00a4\\u00a4\\u00a4'\\u00a4' y \\u00a4\\u00a4\\u00a4 or \\u00a4\\u00a4 but \\u00a4");
-    assertEquals("", expectedFormattedUserStr.unescape(), formattedUserStr);
+    assertEquals("2", expectedFormattedUserStr.unescape(), formattedUserStr);
     assertTrue("", userAffixPattern2.equals(userAffixPattern));
     assertSuccess("", status);
     assertTrue("", affixPattern.usesCurrency());
@@ -1638,7 +1639,7 @@ void NumberFormat2Test::TestAffixPatternAppend() {
   AffixPattern expectedPattern;
   UnicodeString expectedPatternStr("%\\u2030-\\u00a4\\u00a4*");
   AffixPattern::parseUserAffixString(
-          expectedPatternStr, expectedPattern, status);
+          expectedPatternStr.unescape(), expectedPattern, status);
   
   assertTrue("", pattern.append(appendPattern).equals(expectedPattern));
   assertSuccess("", status);