ICU-10485 Fix MeasureUnit failing tests.

X-SVN-Rev: 34546

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
index fa19e2d5583608337059149c402df8719533a1fb..c3927afe837843e67f6d53f76b4b94f0f86abd89 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
@@ -153,8 +153,10 @@ public class MeasureUnit implements Comparable<MeasureUnit>, Serializable {
                     String type = unitsRes.getKey();
                     int unitsSize = unitsRes.getSize();
                     for ( int index2 = 0; index2 < unitsSize; ++index2) {
-                        String unitName = unitsRes.get(index2).getKey();
-                        addUnit(type, unitName, UNIT_FACTORY);
+                        UResourceBundle unitNameRes = unitsRes.get(index2);
+                        if (unitNameRes.containsKey("other")) {
+                            addUnit(type, unitNameRes.getKey(), UNIT_FACTORY);
+                        }
                     }
                 }
             } catch ( MissingResourceException e ) {
@@ -307,9 +309,9 @@ public class MeasureUnit implements Comparable<MeasureUnit>, Serializable {
     /** Constant for unit of angle: degree */
     DEGREE = MeasureUnit.getInstance("angle", "degree"),
     /** Constant for unit of angle: minute */
-    ARC_MINUTE = MeasureUnit.getInstance("angle", "minute"),
+    ARC_MINUTE = MeasureUnit.getInstance("angle", "arc-minute"),
     /** Constant for unit of angle: second */
-    ARC_SECOND = MeasureUnit.getInstance("angle", "second"),
+    ARC_SECOND = MeasureUnit.getInstance("angle", "arc-second"),
     /** Constant for unit of area: acre */
     ACRE = MeasureUnit.getInstance("area", "acre"),
     /** Constant for unit of area: hectare */

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
index 007364b69cf65267a74664bcbcc99d3cfb1b6425..d5bb7a1a38c973f9bdf84b4d01cd5c90d1259ba3 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
@@ -145,10 +145,10 @@ public class MeasureUnitTest extends TestFmwk {
     public void testExamples() {
         GeneralMeasureFormat fmtFr = GeneralMeasureFormat.getInstance(ULocale.FRENCH, FormatWidth.SHORT);
         Measure measure = new Measure(23, MeasureUnit.CELSIUS);
-        assertEquals("", "23°C", fmtFr.format(measure));
+        assertEquals("", "23 °C", fmtFr.format(measure));
 
         Measure measureF = new Measure(70, MeasureUnit.FAHRENHEIT);
-        assertEquals("", "70°F", fmtFr.format(measureF));
+        assertEquals("", "70 °F", fmtFr.format(measureF));
 
         GeneralMeasureFormat fmtFrFull = GeneralMeasureFormat.getInstance(ULocale.FRENCH, FormatWidth.WIDE);
         if (!logKnownIssue("8474", "needs latest CLDR data")) {
@@ -159,7 +159,7 @@ public class MeasureUnitTest extends TestFmwk {
         }
         // Degenerate case
         GeneralMeasureFormat fmtEn = GeneralMeasureFormat.getInstance(ULocale.ENGLISH, FormatWidth.WIDE);
-        assertEquals("", "1 inch, 2 feet", fmtEn.format(new Measure(1, MeasureUnit.INCH),
+        assertEquals("", "1 inch and 2 feet", fmtEn.format(new Measure(1, MeasureUnit.INCH),
                 new Measure(2, MeasureUnit.FOOT)));
 
         logln("Show all currently available units");

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java
index 6d185bbf857e453eab50f4bce07971f5ff2eba10..ffea011ec565bdc4fdd5bf3c2a675c6feff341fb 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestAll.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (c) 2004-2012, International Business Machines
+ * Copyright (c) 2004-2013, International Business Machines
  * Corporation and others.  All Rights Reserved.
  * Copyright (C) 2010 , Yahoo! Inc.                                            
  *******************************************************************************
@@ -29,6 +29,7 @@ public class TestAll extends TestGroup {
                   "com.ibm.icu.dev.test.format.BigNumberFormatTest",
                   "DataDrivenFormatTest",
                   "ListFormatterTest",
+                  "MeasureUnitTest",
                   "TestAll$PluralFormat",
                   "TestAll$MessageFormat",
                   "TestAll$SelectFormat"