Merge "Fix a test that assumes Locale.getDefault() == Locale.US"
diff --git a/luni/src/test/java/libcore/java/util/LocaleTest.java b/luni/src/test/java/libcore/java/util/LocaleTest.java
index 025a3ba..baa53e9 100644
--- a/luni/src/test/java/libcore/java/util/LocaleTest.java
+++ b/luni/src/test/java/libcore/java/util/LocaleTest.java
@@ -814,7 +814,12 @@
b.setLanguage("en").setRegion("US").setScript("Latn");
Locale l = b.build();
+
+ // getDisplayScript() test relies on the default locale. We set it here to avoid test
+ // failures if the test device is set to a non-English locale.
+ Locale.setDefault(Locale.US);
assertEquals("Latin", l.getDisplayScript());
+
assertEquals("Lateinisch", l.getDisplayScript(Locale.GERMAN));
// Fallback for navajo, a language for which we don't have data.
assertEquals("Latin", l.getDisplayScript(new Locale("nv", "US")));
@@ -1163,23 +1168,17 @@
}
public void test_setDefault_setsICUDefaultLocale() {
- Locale l = Locale.getDefault();
+ Locale.setDefault(Locale.GERMANY);
+ assertEquals("de_DE", ICU.getDefaultLocale());
try {
- Locale.setDefault(Locale.GERMANY);
- assertEquals("de_DE", ICU.getDefaultLocale());
-
- try {
- Locale.setDefault(null);
- fail();
- } catch (NullPointerException expected) {
- assertEquals(Locale.GERMANY, Locale.getDefault());
- }
-
- Locale.setDefault(new Locale("bogus", "LOCALE"));
- assertEquals("bogus__LOCALE", ICU.getDefaultLocale());
- } finally {
- Locale.setDefault(l);
+ Locale.setDefault(null);
+ fail();
+ } catch (NullPointerException expected) {
+ assertEquals(Locale.GERMANY, Locale.getDefault());
}
+
+ Locale.setDefault(new Locale("bogus", "LOCALE"));
+ assertEquals("bogus__LOCALE", ICU.getDefaultLocale());
}
}