resolve merge conflicts of 26099b8f0 to stage-aosp-master (9d6467bf) · Commits · e / os / android_frameworks_opt_telephony

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"));
		}
		}