From: Brett Chabot <brettchabot@android.com>
Date: Fri, 8 Jan 2010 23:50:00 +0000 (-0800)
Subject: Fix DecimalFormatTest#test_serializationHarmonyRICompatible.
X-Git-Tag: android-x86-2.2~120^2^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=53a6c01cd8c8560b8eef891871c7260f6cbe71d9;p=android-x86%2Fdalvik.git

Fix DecimalFormatTest#test_serializationHarmonyRICompatible.

Skip the test if required Locale is not present.

Bug 2343677

Change-Id: I0f2672bd4b56cc1685e7368921aaa1e9d4492cf0
---

diff --git a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
index 144de72c0..e908e4a52 100644
--- a/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
+++ b/libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
@@ -2443,8 +2443,12 @@ public class DecimalFormatTest extends TestCase {
         method = "!SerializationGolden",
         args = {}
     )
-    @KnownFailure("a regression. This didn't fail before")
     public void test_serializationHarmonyRICompatible() throws Exception {
+        Locale[] requiredLocales = {Locale.FRANCE};
+        if (!Support_Locale.areLocalesAvailable(requiredLocales)) {
+            // locale dependent test, bug 1943269
+            return;
+        }
         NumberFormat nf = NumberFormat.getInstance(Locale.FRANCE);
 
         DecimalFormat df = null;