Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a10a4bb2 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed phone number not seen on about page" into udc-dev

parents 6181e256 531d3f05
Loading
Loading
Loading
Loading
+83 −0
Original line number Original line Diff line number Diff line
@@ -562,6 +562,17 @@ public class PhoneNumberUtilsTest {
        assertEquals("800-GOOG-114", PhoneNumberUtils.formatNumber("800-GOOG-114", "US"));
        assertEquals("800-GOOG-114", PhoneNumberUtils.formatNumber("800-GOOG-114", "US"));
    }
    }


    @Test
    public void testFormatNumber_lowerCase() {
        assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("650 2910000", "us"));
        assertEquals("223-4567", PhoneNumberUtils.formatNumber("2234567", "us"));
        assertEquals("011 86 10 8888 0000",
                PhoneNumberUtils.formatNumber("011861088880000", "us"));
        assertEquals("010 8888 0000", PhoneNumberUtils.formatNumber("01088880000", "cn"));
        // formatNumber doesn't format alpha numbers, but keep them as they are.
        assertEquals("800-GOOG-114", PhoneNumberUtils.formatNumber("800-GOOG-114", "us"));
    }

    /**
    /**
     * Tests ability to format phone numbers from Japan using the international format when the
     * Tests ability to format phone numbers from Japan using the international format when the
     * current country is not Japan.
     * current country is not Japan.
@@ -570,6 +581,9 @@ public class PhoneNumberUtilsTest {
    @Test
    @Test
    public void testFormatJapanInternational() {
    public void testFormatJapanInternational() {
        assertEquals("+81 90-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "US"));
        assertEquals("+81 90-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "US"));

        // Again with lower case country code
        assertEquals("+81 90-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "us"));
    }
    }


    /**
    /**
@@ -582,8 +596,15 @@ public class PhoneNumberUtilsTest {
        assertEquals("090-6657-0660", PhoneNumberUtils.formatNumber("09066570660", "JP"));
        assertEquals("090-6657-0660", PhoneNumberUtils.formatNumber("09066570660", "JP"));
        assertEquals("090-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "JP"));
        assertEquals("090-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "JP"));


        // Again with lower case country code
        assertEquals("090-6657-0660", PhoneNumberUtils.formatNumber("09066570660", "jp"));
        assertEquals("090-6657-1180", PhoneNumberUtils.formatNumber("+819066571180", "jp"));


        // US number should still be internationally formatted
        // US number should still be internationally formatted
        assertEquals("+1 650-555-1212", PhoneNumberUtils.formatNumber("+16505551212", "JP"));
        assertEquals("+1 650-555-1212", PhoneNumberUtils.formatNumber("+16505551212", "JP"));
        // Again with lower case country code
        assertEquals("+1 650-555-1212", PhoneNumberUtils.formatNumber("+16505551212", "jp"));
    }
    }


    @SmallTest
    @SmallTest
@@ -600,6 +621,20 @@ public class PhoneNumberUtilsTest {
        assertEquals("**650 2910000", PhoneNumberUtils.formatNumber("**650 2910000", "US"));
        assertEquals("**650 2910000", PhoneNumberUtils.formatNumber("**650 2910000", "US"));
    }
    }


    // Same as testFormatNumber_LeadingStarAndHash but using lower case country code.
    @Test
    public void testFormatNumber_LeadingStarAndHash_countryCodeLowerCase() {
        // Numbers with a leading '*' or '#' should be left unchanged.
        assertEquals("*650 2910000", PhoneNumberUtils.formatNumber("*650 2910000", "us"));
        assertEquals("#650 2910000", PhoneNumberUtils.formatNumber("#650 2910000", "us"));
        assertEquals("*#650 2910000", PhoneNumberUtils.formatNumber("*#650 2910000", "us"));
        assertEquals("#*650 2910000", PhoneNumberUtils.formatNumber("#*650 2910000", "us"));
        assertEquals("#650*2910000", PhoneNumberUtils.formatNumber("#650*2910000", "us"));
        assertEquals("#650*2910000", PhoneNumberUtils.formatNumber("#650*2910000", "us"));
        assertEquals("##650 2910000", PhoneNumberUtils.formatNumber("##650 2910000", "us"));
        assertEquals("**650 2910000", PhoneNumberUtils.formatNumber("**650 2910000", "us"));
    }

    @SmallTest
    @SmallTest
    @Test
    @Test
    public void testNormalizeNumber() {
    public void testNormalizeNumber() {
@@ -641,6 +676,38 @@ public class PhoneNumberUtilsTest {
                PhoneNumberUtils.formatNumber("011861088880000", "", "GB"));
                PhoneNumberUtils.formatNumber("011861088880000", "", "GB"));
    }
    }


    // Same as testFormatDailabeNumber but using lower case country code.
    @Test
    public void testFormatDailabeNumber_countryCodeLowerCase() {
        // Using the phoneNumberE164's country code
        assertEquals("(650) 291-0000",
                PhoneNumberUtils.formatNumber("6502910000", "+16502910000", "cn"));
        // Using the default country code for a phone number containing the IDD
        assertEquals("011 86 10 8888 0000",
                PhoneNumberUtils.formatNumber("011861088880000", "+861088880000", "us"));
        assertEquals("00 86 10 8888 0000",
                PhoneNumberUtils.formatNumber("00861088880000", "+861088880000", "gb"));
        assertEquals("+86 10 8888 0000",
                PhoneNumberUtils.formatNumber("+861088880000", "+861088880000", "gb"));
        // Wrong default country, so no formatting is done
        assertEquals("011861088880000",
                PhoneNumberUtils.formatNumber("011861088880000", "+861088880000", "gb"));
        // The phoneNumberE164 is null
        assertEquals("(650) 291-0000", PhoneNumberUtils.formatNumber("6502910000", null, "us"));
        // The given number has a country code.
        assertEquals("+1 650-291-0000", PhoneNumberUtils.formatNumber("+16502910000", null, "cn"));
        // The given number was formatted.
        assertEquals("650-291-0000", PhoneNumberUtils.formatNumber("650-291-0000", null, "us"));
        // A valid Polish number should be formatted.
        assertEquals("506 128 687", PhoneNumberUtils.formatNumber("506128687", null, "pl"));
        // An invalid Polish number should be left as it is. Note Poland doesn't use '0' as a
        // national prefix; therefore, the leading '0' makes the number invalid.
        assertEquals("0506128687", PhoneNumberUtils.formatNumber("0506128687", null, "pl"));
        // Wrong default country, so no formatting is done
        assertEquals("011861088880000",
                PhoneNumberUtils.formatNumber("011861088880000", "", "gb"));
    }

    @FlakyTest
    @FlakyTest
    @Test
    @Test
    @Ignore
    @Ignore
@@ -740,6 +807,22 @@ public class PhoneNumberUtilsTest {
        assertFalse(PhoneNumberUtils.isInternationalNumber("011-613-966-94916", "AU"));
        assertFalse(PhoneNumberUtils.isInternationalNumber("011-613-966-94916", "AU"));
    }
    }


    // Same as testIsInternational but using lower case country code.
    @Test
    public void testIsInternational_countryCodeLowerCase() {
        assertFalse(PhoneNumberUtils.isInternationalNumber("", "us"));
        assertFalse(PhoneNumberUtils.isInternationalNumber(null, "us"));
        assertFalse(PhoneNumberUtils.isInternationalNumber("+16505551212", "us"));
        assertTrue(PhoneNumberUtils.isInternationalNumber("+16505551212", "uk"));
        assertTrue(PhoneNumberUtils.isInternationalNumber("+16505551212", "jp"));
        assertTrue(PhoneNumberUtils.isInternationalNumber("+86 10 8888 0000", "us"));
        assertTrue(PhoneNumberUtils.isInternationalNumber("001-541-754-3010", "de"));
        assertFalse(PhoneNumberUtils.isInternationalNumber("001-541-754-3010", "us"));
        assertTrue(PhoneNumberUtils.isInternationalNumber("01161396694916", "us"));
        assertTrue(PhoneNumberUtils.isInternationalNumber("011-613-966-94916", "us"));
        assertFalse(PhoneNumberUtils.isInternationalNumber("011-613-966-94916", "au"));
    }

    @SmallTest
    @SmallTest
    @Test
    @Test
    public void testIsUriNumber() {
    public void testIsUriNumber() {