diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2011-06-29 08:23:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-29 08:23:06 -0700 |
| commit | b93b8b49767929723bc632ea01e6886bd3a8717c (patch) | |
| tree | f2b8e2d62bd00c10363862af0c064bbcf1821167 /telephony | |
| parent | fe41366e3a92d622c9bc016f91c8294f072d9548 (diff) | |
| parent | 3746f2d91425e24b23ddf34f2b9afef3f3efc3e2 (diff) | |
| download | frameworks_base-b93b8b49767929723bc632ea01e6886bd3a8717c.zip frameworks_base-b93b8b49767929723bc632ea01e6886bd3a8717c.tar.gz frameworks_base-b93b8b49767929723bc632ea01e6886bd3a8717c.tar.bz2 | |
Merge "Use upper case country codes in Country.java"
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java index c4a6f53..6e9d0f9d 100644 --- a/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java +++ b/telephony/tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java @@ -502,16 +502,17 @@ public class PhoneNumberUtilsTest extends AndroidTestCase { @SmallTest public void testFormatNumberToE164() { - assertEquals("+16502910000", PhoneNumberUtils.formatNumberToE164("650 2910000", "us")); - assertNull(PhoneNumberUtils.formatNumberToE164("1234567", "us")); - assertEquals("+18004664114", PhoneNumberUtils.formatNumberToE164("800-GOOG-114", "us")); + // Note: ISO 3166-1 only allows upper case country codes. + assertEquals("+16502910000", PhoneNumberUtils.formatNumberToE164("650 2910000", "US")); + assertNull(PhoneNumberUtils.formatNumberToE164("1234567", "US")); + assertEquals("+18004664114", PhoneNumberUtils.formatNumberToE164("800-GOOG-114", "US")); } @SmallTest public void testFormatNumber() { - assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("650 2910000", "us")); - assertEquals("123-4567", PhoneNumberUtils.formatNumber("1234567", "us")); - assertEquals("(800) 466-4114", PhoneNumberUtils.formatNumber("800-GOOG-114", "us")); + assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("650 2910000", "US")); + assertEquals("123-4567", PhoneNumberUtils.formatNumber("1234567", "US")); + assertEquals("(800) 466-4114", PhoneNumberUtils.formatNumber("800-GOOG-114", "US")); } |