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

Commit d6cf8ef9 authored by fionaxu's avatar fionaxu
Browse files

resolve merge conflicts of 26099b8f to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0b6297094be97e2bdb063502d039f63ed709ef03
parents 1ec98512 26099b8f

tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java

+17 −0
Original line number Diff line number Diff line
@@ -733,4 +733,21 @@ public class PhoneNumberUtilsTest { 
        assertTrue(PhoneNumberUtils.isInternationalNumber("011-613-966-94916", "US"));

        assertFalse(PhoneNumberUtils.isInternationalNumber("011-613-966-94916", "AU"));

    }



    @SmallTest

    @Test

    public void testIsUriNumber() {

        assertTrue(PhoneNumberUtils.isUriNumber("foo@google.com"));

        assertTrue(PhoneNumberUtils.isUriNumber("xyz@zzz.org"));

        assertFalse(PhoneNumberUtils.isUriNumber("+15103331245"));

        assertFalse(PhoneNumberUtils.isUriNumber("+659231235"));

    }



    @SmallTest

    @Test

    public void testGetUsernameFromUriNumber() {

        assertEquals("john", PhoneNumberUtils.getUsernameFromUriNumber("john@myorg.com"));

        assertEquals("tim_123", PhoneNumberUtils.getUsernameFromUriNumber("tim_123@zzz.org"));

        assertEquals("5103331245", PhoneNumberUtils.getUsernameFromUriNumber("5103331245"));

    }

}