Synced DecimalFormatSymbols and tests.

Change on 2017/01/31 by kstanger <kstanger@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=146111847
google · Feb 3, 2017 · 459c93e · 459c93e
1 parent 8d59d23
commit 459c93e
Show file tree

Hide file tree

Showing 8 changed files with 1,668 additions and 651 deletions.
diff --git a/jre_emul/android/libcore/luni/src/main/java/java/text/DecimalFormatSymbols.java b/jre_emul/android/libcore/luni/src/main/java/java/text/DecimalFormatSymbols.java
diff --git a/...mony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.java b/...mony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.java
diff --git a/.../test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser b/.../test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser
diff --git a/...rces/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser b/...rces/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser
diff --git a/jre_emul/android/platform/libcore/luni/src/objc/java/libcore/icu/LocaleData.java b/jre_emul/android/platform/libcore/luni/src/objc/java/libcore/icu/LocaleData.java
@@ -116,7 +116,6 @@ public final class LocaleData {
     private LocaleData() {
     }
 
-    /* J2ObjC unused.
     public static Locale mapInvalidAndNullLocales(Locale locale) {
         if (locale == null) {
             return Locale.getDefault();
@@ -127,7 +126,7 @@ public static Locale mapInvalidAndNullLocales(Locale locale) {
         }
 
         return locale;
-    }*/
+    }
 
     /**
      * Returns a shared LocaleData for the given locale.

diff --git a/jre_emul/android/platform/libcore/luni/src/objc/native/libcore_icu_ICU.m b/jre_emul/android/platform/libcore/luni/src/objc/native/libcore_icu_ICU.m
@@ -332,7 +332,12 @@ jboolean Java_libcore_icu_ICU_initLocaleDataNative(
   result->monetarySeparator_ = [[numberFormatter currencyGroupingSeparator] characterAtIndex:0];
   LibcoreIcuLocaleData_set_minusSign_(result, [numberFormatter minusSign]);
   LibcoreIcuLocaleData_set_exponentSeparator_(result, [numberFormatter exponentSymbol]);
-  LibcoreIcuLocaleData_set_infinity_(result, [numberFormatter positiveInfinitySymbol]);
+  NSString *infinity = [numberFormatter positiveInfinitySymbol];
+  NSString *plusSign = [numberFormatter plusSign];
+  if ([infinity hasPrefix:plusSign]) {
+    infinity = [infinity substringFromIndex:plusSign.length];
+  }
+  LibcoreIcuLocaleData_set_infinity_(result, infinity);
   LibcoreIcuLocaleData_set_NaN_(result, [numberFormatter notANumberSymbol]);
   LibcoreIcuLocaleData_set_currencySymbol_(result, [numberFormatter currencySymbol]);
   LibcoreIcuLocaleData_set_internationalCurrencySymbol_(