diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-18 21:09:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-18 21:09:31 +0000 |
| commit | a1eb5e8aa202df11f7b43d4b3dea74a9cc18229d (patch) | |
| tree | c55a894e392755bfd00e35eae74a4d1ec422318d /luni/src/test/java | |
| parent | 5bb086b7518d7d717a4d2913e2b442c6e01cd16f (diff) | |
| parent | 9f4d966767bdf4fba4735aacc72d32cbb07fd4fd (diff) | |
| download | libcore-a1eb5e8aa202df11f7b43d4b3dea74a9cc18229d.zip libcore-a1eb5e8aa202df11f7b43d4b3dea74a9cc18229d.tar.gz libcore-a1eb5e8aa202df11f7b43d4b3dea74a9cc18229d.tar.bz2 | |
am 9f4d9667: am cac5dab2: Merge "Fix getISO3Country and getISO3Language."
* commit '9f4d966767bdf4fba4735aacc72d32cbb07fd4fd':
Fix getISO3Country and getISO3Language.
Diffstat (limited to 'luni/src/test/java')
| -rw-r--r-- | luni/src/test/java/libcore/java/util/LocaleTest.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/luni/src/test/java/libcore/java/util/LocaleTest.java b/luni/src/test/java/libcore/java/util/LocaleTest.java index 0512b13..f3b31bb 100644 --- a/luni/src/test/java/libcore/java/util/LocaleTest.java +++ b/luni/src/test/java/libcore/java/util/LocaleTest.java @@ -186,6 +186,10 @@ public class LocaleTest extends junit.framework.TestCase { assertEquals("CAN", new Locale("", "CA").getISO3Country()); assertEquals("CAN", new Locale("en", "CA").getISO3Country()); assertEquals("CAN", new Locale("xx", "CA").getISO3Country()); + + // 3 letter country codes. + assertEquals("CAN", new Locale("en", "CAN").getISO3Country()); + assertEquals("CAN", new Locale("frankenderp", "CAN").getISO3Country()); } public void test_getISO3Language() { @@ -205,6 +209,10 @@ public class LocaleTest extends junit.framework.TestCase { assertEquals("eng", new Locale("en", "").getISO3Language()); assertEquals("eng", new Locale("en", "CA").getISO3Language()); assertEquals("eng", new Locale("en", "XX").getISO3Language()); + + // 3 letter language code. + assertEquals("eng", new Locale("eng", "USA").getISO3Language()); + assertEquals("eng", new Locale("eng", "US").getISO3Language()); } public void test_Builder_setLanguage() { |