summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Bornstein <>2009-04-13 17:46:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-13 17:46:03 -0700
commita72a68790d3e2f49900c3fdf8f9bc195f5500ac3 (patch)
treed56feb67351e870f8c5ca7398f91b7d492555205
parentb81ff457a3c22194018f4fff8a35d228f6e40293 (diff)
parent6d20e257a7d2279ea20c07ee66b1e73eb1c7ea65 (diff)
downloadframeworks_base-a72a68790d3e2f49900c3fdf8f9bc195f5500ac3.zip
frameworks_base-a72a68790d3e2f49900c3fdf8f9bc195f5500ac3.tar.gz
frameworks_base-a72a68790d3e2f49900c3fdf8f9bc195f5500ac3.tar.bz2
Merge branch 'readonly-p4-donut' into donut
-rw-r--r--tests/CoreTests/android/core/LocaleTest.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/CoreTests/android/core/LocaleTest.java b/tests/CoreTests/android/core/LocaleTest.java
index 72489c6..88b0c06 100644
--- a/tests/CoreTests/android/core/LocaleTest.java
+++ b/tests/CoreTests/android/core/LocaleTest.java
@@ -28,7 +28,6 @@ import java.util.TimeZone;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
/**
* Test some locale-dependent stuff for Android. This test mainly ensures that
@@ -126,9 +125,9 @@ public class LocaleTest extends TestCase {
}
*/
- // This one makes sure we have all necessary locales installed.
- // Suppress this flaky test for now.
- @Suppress
+ // Regression test for 1118570: Create test cases for tracking ICU config
+ // changes. This one makes sure we have all necessary locales installed.
+ @MediumTest
public void testICULocales() {
String[] locales = new String[] {
// List of locales currently required for Android.