commit 9221e703200b798d4fd02f01bdb96703dad4f3ea
author Narayan Kamath <narayan@google.com> Fri Mar 18 11:56:40 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 18 11:56:40 2016 +0000
tree 2caa9679df8774730606fde2c62056ff1de7b022
parent 0364ac9c80cbbfbc938f0618a2279eb4ee546bd6
parent df851d282203e8ea9ba16782462a76dd6f265558

Merge "Add tests for Locale.set[get]Default(Locale.Category..)"

luni/src/test/java/libcore/java/util/LocaleTest.java

diff --git a/luni/src/test/java/libcore/java/util/LocaleTest.java b/luni/src/test/java/libcore/java/util/LocaleTest.java
index 8d184e2..f9146b3 100644
--- a/luni/src/test/java/libcore/java/util/LocaleTest.java
+++ b/luni/src/test/java/libcore/java/util/LocaleTest.java
@@ -1250,4 +1250,31 @@
             Locale l = (Locale) oinput.readObject();
         }
     }
+
+    public void test_setDefault_withCategory() {
+        final Locale defaultLocale = Locale.getDefault();
+        try {
+            Locale.setDefault(Locale.US);
+            assertEquals(Locale.US, Locale.getDefault(Locale.Category.FORMAT));
+            assertEquals(Locale.US, Locale.getDefault(Locale.Category.DISPLAY));
+            assertEquals(Locale.US, Locale.getDefault());
+
+            Locale.setDefault(Locale.Category.FORMAT, Locale.UK);
+            assertEquals(Locale.UK, Locale.getDefault(Locale.Category.FORMAT));
+            assertEquals(Locale.US, Locale.getDefault(Locale.Category.DISPLAY));
+            assertEquals(Locale.US, Locale.getDefault());
+
+            Locale.setDefault(Locale.Category.DISPLAY, Locale.CANADA);
+            assertEquals(Locale.UK, Locale.getDefault(Locale.Category.FORMAT));
+            assertEquals(Locale.CANADA, Locale.getDefault(Locale.Category.DISPLAY));
+            assertEquals(Locale.US, Locale.getDefault());
+
+            Locale.setDefault(Locale.FRANCE);
+            assertEquals(Locale.FRANCE, Locale.getDefault(Locale.Category.FORMAT));
+            assertEquals(Locale.FRANCE, Locale.getDefault(Locale.Category.DISPLAY));
+            assertEquals(Locale.FRANCE, Locale.getDefault());
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
 }