diff options
Diffstat (limited to 'libphonenumber/test/com/google')
40 files changed, 168 insertions, 111 deletions
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java index f6a4226a..3d3316ab 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java @@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMapForTesting { // countries sharing a calling code, such as the NANPA countries, the one // indicated with "isMainCountryForCode" in the metadata should be first. static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() { - // The capacity is set to 32 as there are 24 different entries, + // The capacity is set to 33 as there are 25 different entries, // and this offers a load factor of roughly 0.75. Map<Integer, List<String>> countryCodeToRegionCodeMap = - new HashMap<Integer, List<String>>(32); + new HashMap<Integer, List<String>>(33); ArrayList<String> listWithRegionCode; @@ -122,6 +122,10 @@ public class CountryCodeToRegionCodeMapForTesting { countryCodeToRegionCodeMap.put(262, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); + listWithRegionCode.add("AM"); + countryCodeToRegionCodeMap.put(374, listWithRegionCode); + + listWithRegionCode = new ArrayList<String>(1); listWithRegionCode.add("BY"); countryCodeToRegionCodeMap.put(375, listWithRegionCode); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java index 2591131b..d21d9ba3 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java @@ -31,19 +31,20 @@ import java.util.logging.Logger; /** * Verifies all of the example numbers in the metadata are valid and of the correct type. If no - * example number exists for a particular type, the test still passes. + * example number exists for a particular type, the test still passes since not all types are + * relevant for all regions. Tests that check the XML schema will ensure that an exampleNumber + * node is present for every phone number description. */ public class ExampleNumbersTest extends TestCase { - private static final Logger LOGGER = Logger.getLogger(ExampleNumbersTest.class.getName()); - private PhoneNumberUtil phoneNumberUtil = - PhoneNumberUtil.createInstance(PhoneNumberUtil.DEFAULT_METADATA_LOADER); + private static final Logger logger = Logger.getLogger(ExampleNumbersTest.class.getName()); + private PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance(); private ShortNumberInfo shortNumberInfo = ShortNumberInfo.getInstance(); private List<PhoneNumber> invalidCases = new ArrayList<PhoneNumber>(); private List<PhoneNumber> wrongTypeCases = new ArrayList<PhoneNumber>(); /** * @param exampleNumberRequestedType type we are requesting an example number for - * @param possibleExpectedTypes acceptable types that this number should match, such as + * @param possibleExpectedTypes acceptable types that this number should match, such as * FIXED_LINE and FIXED_LINE_OR_MOBILE for a fixed line example number. */ private void checkNumbersValidAndCorrectType(PhoneNumberType exampleNumberRequestedType, @@ -54,18 +55,18 @@ public class ExampleNumbersTest extends TestCase { if (exampleNumber != null) { if (!phoneNumberUtil.isValidNumber(exampleNumber)) { invalidCases.add(exampleNumber); - LOGGER.log(Level.SEVERE, "Failed validation for " + exampleNumber.toString()); + logger.log(Level.SEVERE, "Failed validation for " + exampleNumber.toString()); } else { // We know the number is valid, now we check the type. PhoneNumberType exampleNumberType = phoneNumberUtil.getNumberType(exampleNumber); if (!possibleExpectedTypes.contains(exampleNumberType)) { wrongTypeCases.add(exampleNumber); - LOGGER.log(Level.SEVERE, "Wrong type for " + - exampleNumber.toString() + - ": got " + exampleNumberType); - LOGGER.log(Level.WARNING, "Expected types: "); + logger.log(Level.SEVERE, "Wrong type for " + + exampleNumber.toString() + + ": got " + exampleNumberType); + logger.log(Level.WARNING, "Expected types: "); for (PhoneNumberType type : possibleExpectedTypes) { - LOGGER.log(Level.WARNING, type.toString()); + logger.log(Level.WARNING, type.toString()); } } } @@ -148,12 +149,12 @@ public class ExampleNumbersTest extends TestCase { exampleNumber = phoneNumberUtil.parse(desc.getExampleNumber(), regionCode); } } catch (NumberParseException e) { - LOGGER.log(Level.SEVERE, e.toString()); + logger.log(Level.SEVERE, e.toString()); } if (exampleNumber != null && phoneNumberUtil.canBeInternationallyDialled(exampleNumber)) { wrongTypeCases.add(exampleNumber); - LOGGER.log(Level.SEVERE, "Number " + exampleNumber.toString() - + " should not be internationally diallable"); + logger.log(Level.SEVERE, "Number " + exampleNumber.toString() + + " should not be internationally diallable"); } } assertEquals(0, wrongTypeCases.size()); @@ -166,7 +167,7 @@ public class ExampleNumbersTest extends TestCase { assertNotNull("No example phone number for calling code " + callingCode, exampleNumber); if (!phoneNumberUtil.isValidNumber(exampleNumber)) { invalidCases.add(exampleNumber); - LOGGER.log(Level.SEVERE, "Failed validation for " + exampleNumber.toString()); + logger.log(Level.SEVERE, "Failed validation for " + exampleNumber.toString()); } } assertEquals(0, invalidCases.size()); @@ -188,6 +189,9 @@ public class ExampleNumbersTest extends TestCase { public void testEveryTypeHasAnExampleNumber() throws Exception { for (PhoneNumberUtil.PhoneNumberType type : PhoneNumberUtil.PhoneNumberType.values()) { + if (type == PhoneNumberType.UNKNOWN) { + continue; + } PhoneNumber exampleNumber = phoneNumberUtil.getExampleNumberForType(type); assertNotNull("No example number found for type " + type, exampleNumber); } @@ -199,15 +203,15 @@ public class ExampleNumbersTest extends TestCase { String exampleShortNumber = shortNumberInfo.getExampleShortNumber(regionCode); if (!shortNumberInfo.isValidShortNumberForRegion( phoneNumberUtil.parse(exampleShortNumber, regionCode), regionCode)) { - String invalidStringCase = "region_code: " + regionCode + ", national_number: " + - exampleShortNumber; + String invalidStringCase = "region_code: " + regionCode + ", national_number: " + + exampleShortNumber; invalidStringCases.add(invalidStringCase); - LOGGER.log(Level.SEVERE, "Failed validation for string " + invalidStringCase); + logger.log(Level.SEVERE, "Failed validation for string " + invalidStringCase); } PhoneNumber phoneNumber = phoneNumberUtil.parse(exampleShortNumber, regionCode); if (!shortNumberInfo.isValidShortNumber(phoneNumber)) { invalidCases.add(phoneNumber); - LOGGER.log(Level.SEVERE, "Failed validation for " + phoneNumber.toString()); + logger.log(Level.SEVERE, "Failed validation for " + phoneNumber.toString()); } for (ShortNumberInfo.ShortNumberCost cost : ShortNumberInfo.ShortNumberCost.values()) { @@ -218,7 +222,7 @@ public class ExampleNumbersTest extends TestCase { shortNumberInfo.getExpectedCostForRegion(phoneNumber, regionCode); if (cost != exampleShortNumberCost) { wrongTypeCases.add(phoneNumber); - LOGGER.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString() + logger.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString() + ": got " + exampleShortNumberCost + ", expected: " + cost); } @@ -241,11 +245,11 @@ public class ExampleNumbersTest extends TestCase { if (!shortNumberInfo.isPossibleShortNumberForRegion(phoneNumber, regionCode) || !shortNumberInfo.isEmergencyNumber(exampleNumber, regionCode)) { wrongTypeCounter++; - LOGGER.log(Level.SEVERE, "Emergency example number test failed for " + regionCode); + logger.log(Level.SEVERE, "Emergency example number test failed for " + regionCode); } else if (shortNumberInfo.getExpectedCostForRegion(phoneNumber, regionCode) != ShortNumberInfo.ShortNumberCost.TOLL_FREE) { wrongTypeCounter++; - LOGGER.log(Level.WARNING, "Emergency example number not toll free for " + regionCode); + logger.log(Level.WARNING, "Emergency example number not toll free for " + regionCode); } } } @@ -264,7 +268,7 @@ public class ExampleNumbersTest extends TestCase { if (!shortNumberInfo.isPossibleShortNumberForRegion(carrierSpecificNumber, regionCode) || !shortNumberInfo.isCarrierSpecific(carrierSpecificNumber)) { wrongTagCounter++; - LOGGER.log(Level.SEVERE, "Carrier-specific test failed for " + regionCode); + logger.log(Level.SEVERE, "Carrier-specific test failed for " + regionCode); } } // TODO: Test other tags here. diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java index 229d8f7d..f4905532 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java @@ -17,26 +17,18 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; - +import java.util.concurrent.ConcurrentHashMap; import junit.framework.TestCase; /** - * Some basic tests to check that the phone number metadata can be correctly loaded. + * Some basic tests to check that metadata can be correctly loaded. */ public class MetadataManagerTest extends TestCase { - - public void testAlternateFormatsContainsData() throws Exception { + public void testAlternateFormatsLoadCorrectly() { // We should have some data for Germany. - PhoneMetadata germanyAlternateFormats = MetadataManager.getAlternateFormatsForCountry(49); - assertNotNull(germanyAlternateFormats); - assertTrue(germanyAlternateFormats.numberFormats().size() > 0); - } - - public void testShortNumberMetadataContainsData() throws Exception { - // We should have some data for France. - PhoneMetadata franceShortNumberMetadata = MetadataManager.getShortNumberMetadataForRegion("FR"); - assertNotNull(franceShortNumberMetadata); - assertTrue(franceShortNumberMetadata.hasShortCode()); + PhoneMetadata germanyMetadata = MetadataManager.getAlternateFormatsForCountry(49); + assertNotNull(germanyMetadata); + assertTrue(germanyMetadata.numberFormats().size() > 0); } public void testAlternateFormatsFailsGracefully() throws Exception { @@ -44,8 +36,53 @@ public class MetadataManagerTest extends TestCase { assertNull(noAlternateFormats); } + public void testShortNumberMetadataLoadCorrectly() throws Exception { + // We should have some data for France. + PhoneMetadata franceMetadata = MetadataManager.getShortNumberMetadataForRegion("FR"); + assertNotNull(franceMetadata); + assertTrue(franceMetadata.hasShortCode()); + } + public void testShortNumberMetadataFailsGracefully() throws Exception { PhoneMetadata noShortNumberMetadata = MetadataManager.getShortNumberMetadataForRegion("XXX"); assertNull(noShortNumberMetadata); } + + public void testGetMetadataFromMultiFilePrefix_regionCode() { + ConcurrentHashMap<String, PhoneMetadata> map = new ConcurrentHashMap<String, PhoneMetadata>(); + PhoneMetadata metadata = MetadataManager.getMetadataFromMultiFilePrefix("CA", map, + "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", + MetadataManager.DEFAULT_METADATA_LOADER); + assertEquals(metadata, map.get("CA")); + } + + public void testGetMetadataFromMultiFilePrefix_countryCallingCode() { + ConcurrentHashMap<Integer, PhoneMetadata> map = new ConcurrentHashMap<Integer, PhoneMetadata>(); + PhoneMetadata metadata = MetadataManager.getMetadataFromMultiFilePrefix(800, map, + "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", + MetadataManager.DEFAULT_METADATA_LOADER); + assertEquals(metadata, map.get(800)); + } + + public void testGetMetadataFromMultiFilePrefix_missingMetadataFileThrowsRuntimeException() { + // In normal usage we should never get a state where we are asking to load metadata that doesn't + // exist. However if the library is packaged incorrectly in the jar, this could happen and the + // best we can do is make sure the exception has the file name in it. + try { + MetadataManager.getMetadataFromMultiFilePrefix("XX", + new ConcurrentHashMap<String, PhoneMetadata>(), "no/such/file", + MetadataManager.DEFAULT_METADATA_LOADER); + fail("expected exception"); + } catch (RuntimeException e) { + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX")); + } + try { + MetadataManager.getMetadataFromMultiFilePrefix(123, + new ConcurrentHashMap<Integer, PhoneMetadata>(), "no/such/file", + MetadataManager.DEFAULT_METADATA_LOADER); + fail("expected exception"); + } catch (RuntimeException e) { + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123")); + } + } } diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java index cf9bc90d..7c9b0faf 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java @@ -17,51 +17,46 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; - -import java.util.concurrent.ConcurrentHashMap; import junit.framework.TestCase; /** * Unit tests for MultiFileMetadataSourceImpl.java. */ public class MultiFileMetadataSourceImplTest extends TestCase { - public MultiFileMetadataSourceImplTest() {} - - public void testGeographicalRegionMetadataLoadsCorrectly() { - ConcurrentHashMap<String, PhoneMetadata> map = new ConcurrentHashMap<String, PhoneMetadata>(); - PhoneMetadata metadata = MultiFileMetadataSourceImpl.loadMetadataFromFile( - "CA", map, "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", - PhoneNumberUtil.DEFAULT_METADATA_LOADER); - assertEquals(metadata, map.get("CA")); - } + private static final MultiFileMetadataSourceImpl SOURCE = + new MultiFileMetadataSourceImpl(MetadataManager.DEFAULT_METADATA_LOADER); + private static final MultiFileMetadataSourceImpl MISSING_FILE_SOURCE = + new MultiFileMetadataSourceImpl("no/such/file", MetadataManager.DEFAULT_METADATA_LOADER); - public void testNonGeographicalRegionMetadataLoadsCorrectly() { - ConcurrentHashMap<Integer, PhoneMetadata> map = new ConcurrentHashMap<Integer, PhoneMetadata>(); - PhoneMetadata metadata = MultiFileMetadataSourceImpl.loadMetadataFromFile( - 800, map, "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", - PhoneNumberUtil.DEFAULT_METADATA_LOADER); - assertEquals(metadata, map.get(800)); + public void testGeoPhoneNumberMetadataLoadCorrectly() { + // We should have some data for the UAE. + PhoneMetadata uaeMetadata = SOURCE.getMetadataForRegion("AE"); + assertEquals(uaeMetadata.getCountryCode(), 971); + assertTrue(uaeMetadata.hasGeneralDesc()); } - public void testMissingMetadataFileThrowsRuntimeException() { - // In normal usage we should never get a state where we are asking to load metadata that doesn't - // exist. However if the library is packaged incorrectly in the jar, this could happen and the - // best we can do is make sure the exception has the file name in it. + public void testGeoPhoneNumberMetadataLoadFromMissingFileThrowsException() throws Exception { try { - MultiFileMetadataSourceImpl.loadMetadataFromFile( - "XX", new ConcurrentHashMap<String, PhoneMetadata>(), "no/such/file", - PhoneNumberUtil.DEFAULT_METADATA_LOADER); + MISSING_FILE_SOURCE.getMetadataForRegion("AE"); fail("expected exception"); } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX")); + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file")); } + } + + public void testNonGeoPhoneNumberMetadataLoadCorrectly() { + // We should have some data for international toll-free numbers. + PhoneMetadata intlMetadata = SOURCE.getMetadataForNonGeographicalRegion(800); + assertEquals(intlMetadata.getId(), "001"); + assertTrue(intlMetadata.hasGeneralDesc()); + } + + public void testNonGeoPhoneNumberMetadataLoadFromMissingFileThrowsException() throws Exception { try { - MultiFileMetadataSourceImpl.loadMetadataFromFile( - 123, new ConcurrentHashMap<Integer, PhoneMetadata>(), "no/such/file", - PhoneNumberUtil.DEFAULT_METADATA_LOADER); + MISSING_FILE_SOURCE.getMetadataForNonGeographicalRegion(800); fail("expected exception"); } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123")); + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file")); } } } diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java index 4a2dc11a..5bd13b8b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java @@ -119,8 +119,8 @@ public class PhoneNumberMatcherTest extends TestMetadataTestCase { // Using a full-width plus sign. doTestFindInContext("\uFF0B1 (650) 333-6000", RegionCode.SG); // The whole number, including punctuation, is here represented in full-width form. - doTestFindInContext("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + - "\u3000\uFF13\uFF13\uFF13\uFF0D\uFF16\uFF10\uFF10\uFF10", + doTestFindInContext("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + + "\u3000\uFF13\uFF13\uFF13\uFF0D\uFF16\uFF10\uFF10\uFF10", RegionCode.SG); } @@ -611,8 +611,8 @@ public class PhoneNumberMatcherTest extends TestMetadataTestCase { } else { if (!test.rawString.equals(match.rawString())) { wrongMatchFoundCount++; - System.err.println("Found wrong match in test " + test.toString() + - ". Found " + match.rawString()); + System.err.println("Found wrong match in test " + test.toString() + + ". Found " + match.rawString()); } } } diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index e5313c7b..812a04c4 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -144,9 +144,9 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals("$1 $2 $3", metadata.getNumberFormat(1).getFormat()); assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", metadata.getGeneralDesc().getNationalNumberPattern()); - assertEquals("\\d{7}(?:\\d{3})?", metadata.getGeneralDesc().getPossibleNumberPattern()); - assertTrue(metadata.getGeneralDesc().exactlySameAs(metadata.getFixedLine())); - assertEquals("\\d{10}", metadata.getTollFree().getPossibleNumberPattern()); + assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", + metadata.getFixedLine().getNationalNumberPattern()); + assertEquals(1, metadata.getGeneralDesc().getPossibleLengthCount()); assertEquals(10, metadata.getGeneralDesc().getPossibleLength(0)); // Possible lengths are the same as the general description, so aren't stored separately in the // toll free element as well. @@ -154,7 +154,6 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals("900\\d{7}", metadata.getPremiumRate().getNationalNumberPattern()); // No shared-cost data is available, so it should be initialised to "NA". assertEquals("NA", metadata.getSharedCost().getNationalNumberPattern()); - assertEquals("NA", metadata.getSharedCost().getPossibleNumberPattern()); } public void testGetInstanceLoadDEMetadata() { @@ -177,9 +176,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(2, metadata.getMobile().getPossibleLengthCount()); assertEquals("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}", metadata.getFixedLine().getNationalNumberPattern()); - assertEquals("\\d{2,14}", metadata.getFixedLine().getPossibleNumberPattern()); assertEquals("30123456", metadata.getFixedLine().getExampleNumber()); - assertEquals("\\d{10}", metadata.getTollFree().getPossibleNumberPattern()); + assertEquals(10, metadata.getTollFree().getPossibleLength(0)); assertEquals("900([135]\\d{6}|9\\d{7})", metadata.getPremiumRate().getNationalNumberPattern()); } @@ -205,7 +203,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(800, metadata.getCountryCode()); assertEquals("$1 $2", metadata.getNumberFormat(0).getFormat()); assertEquals("(\\d{4})(\\d{4})", metadata.getNumberFormat(0).getPattern()); - assertEquals("12345678", metadata.getGeneralDesc().getExampleNumber()); + assertEquals(0, metadata.getGeneralDesc().getPossibleLengthLocalOnlyCount()); + assertEquals(1, metadata.getGeneralDesc().getPossibleLengthCount()); assertEquals("12345678", metadata.getTollFree().getExampleNumber()); } @@ -340,8 +339,6 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(null, phoneUtil.getExampleNumberForType(RegionCode.DE, PhoneNumberUtil.PhoneNumberType.MOBILE)); - // For the US, the example number is placed under general description, and hence should be used - // for both fixed line and mobile, so neither of these should return null. assertNotNull(phoneUtil.getExampleNumberForType(RegionCode.US, PhoneNumberUtil.PhoneNumberType.FIXED_LINE)); assertNotNull(phoneUtil.getExampleNumberForType(RegionCode.US, @@ -422,8 +419,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { } public void testNormaliseStripNonDiallableCharacters() { - String inputNumber = "03*4-56&+a#234"; - String expectedOutput = "03*456+234"; + String inputNumber = "03*4-56&+1a#234"; + String expectedOutput = "03*456+1#234"; assertEquals("Conversion did not correctly remove non-diallable characters", expectedOutput, PhoneNumberUtil.normalizeDiallableCharsOnly(inputNumber)); @@ -727,10 +724,15 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatNationalNumberWithPreferredCarrierCode(arNumber, "15")); assertEquals("01234 19 12-5678", phoneUtil.formatNationalNumberWithPreferredCarrierCode(arNumber, "")); - // When the preferred_domestic_carrier_code is present (even when it contains an empty string), - // use it instead of the default carrier code passed in. + // When the preferred_domestic_carrier_code is present (even when it is just a space), use it + // instead of the default carrier code passed in. + arNumber.setPreferredDomesticCarrierCode(" "); + assertEquals("01234 12-5678", + phoneUtil.formatNationalNumberWithPreferredCarrierCode(arNumber, "15")); + // When the preferred_domestic_carrier_code is present but empty, treat it as unset and use + // instead the default carrier code passed in. arNumber.setPreferredDomesticCarrierCode(""); - assertEquals("01234 12-5678", + assertEquals("01234 15 12-5678", phoneUtil.formatNationalNumberWithPreferredCarrierCode(arNumber, "15")); // We don't support this for the US so there should be no change. PhoneNumber usNumber = new PhoneNumber(); @@ -1315,7 +1317,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertTrue(phoneUtil.isPossibleNumber("253-0000", RegionCode.US)); assertTrue(phoneUtil.isPossibleNumber("+1 650 253 0000", RegionCode.GB)); assertTrue(phoneUtil.isPossibleNumber("+44 20 7031 3000", RegionCode.GB)); - assertTrue(phoneUtil.isPossibleNumber("(020) 7031 3000", RegionCode.GB)); + assertTrue(phoneUtil.isPossibleNumber("(020) 7031 300", RegionCode.GB)); assertTrue(phoneUtil.isPossibleNumber("7031 3000", RegionCode.GB)); assertTrue(phoneUtil.isPossibleNumber("3331 6005", RegionCode.NZ)); assertTrue(phoneUtil.isPossibleNumber("+800 1234 5678", RegionCode.UN001)); @@ -2188,12 +2190,9 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(NZ_NUMBER, phoneUtil.parse("tel:03-331-6005;isub=12345;phone-context=+64", RegionCode.ZZ)); - // It is important that we set the carrier code to an empty string, since we used - // ParseAndKeepRawInput and no carrier code was found. PhoneNumber nzNumberWithRawInput = new PhoneNumber().mergeFrom(NZ_NUMBER). setRawInput("+64 3 331 6005"). - setCountryCodeSource(CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN). - setPreferredDomesticCarrierCode(""); + setCountryCodeSource(CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN); assertEquals(nzNumberWithRawInput, phoneUtil.parseAndKeepRawInput("+64 3 331 6005", RegionCode.ZZ)); // Null is also allowed for the region code in these cases. @@ -2295,16 +2294,14 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testParseAndKeepRaw() throws Exception { PhoneNumber alphaNumericNumber = new PhoneNumber().mergeFrom(ALPHA_NUMERIC_NUMBER). setRawInput("800 six-flags"). - setCountryCodeSource(CountryCodeSource.FROM_DEFAULT_COUNTRY). - setPreferredDomesticCarrierCode(""); + setCountryCodeSource(CountryCodeSource.FROM_DEFAULT_COUNTRY); assertEquals(alphaNumericNumber, phoneUtil.parseAndKeepRawInput("800 six-flags", RegionCode.US)); PhoneNumber shorterAlphaNumber = new PhoneNumber(). setCountryCode(1).setNationalNumber(8007493524L). setRawInput("1800 six-flag"). - setCountryCodeSource(CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN). - setPreferredDomesticCarrierCode(""); + setCountryCodeSource(CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN); assertEquals(shorterAlphaNumber, phoneUtil.parseAndKeepRawInput("1800 six-flag", RegionCode.US)); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java index 5b7f1303..664fc52d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java @@ -20,18 +20,26 @@ import junit.framework.TestCase; /** * Unit tests for SingleFileMetadataSourceImpl.java. + * + * <p> + * We do not package single file metadata files, so it is only possible to test failures here. */ public class SingleFileMetadataSourceImplTest extends TestCase { - public SingleFileMetadataSourceImplTest() {} + private static final SingleFileMetadataSourceImpl MISSING_FILE_SOURCE = + new SingleFileMetadataSourceImpl("no/such/file", MetadataManager.DEFAULT_METADATA_LOADER); + + public void testGeoPhoneNumberMetadataLoadFromMissingFileThrowsException() throws Exception { + try { + MISSING_FILE_SOURCE.getMetadataForRegion("AE"); + fail("expected exception"); + } catch (RuntimeException e) { + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file")); + } + } - public void testMissingMetadataFileThrowsRuntimeException() { - SingleFileMetadataSourceImpl singleFileMetadataSource = new SingleFileMetadataSourceImpl( - "no/such/file", PhoneNumberUtil.DEFAULT_METADATA_LOADER); - // In normal usage we should never get a state where we are asking to load metadata that doesn't - // exist. However if the library is packaged incorrectly in the jar, this could happen and the - // best we can do is make sure the exception has the file name in it. + public void testNonGeoPhoneNumberMetadataLoadFromMissingFileThrowsException() throws Exception { try { - singleFileMetadataSource.loadMetadataFromFile(); + MISSING_FILE_SOURCE.getMetadataForNonGeographicalRegion(800); fail("expected exception"); } catch (RuntimeException e) { assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file")); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java index ca9014d4..51360d71 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java @@ -23,25 +23,37 @@ import junit.framework.TestCase; * <p> * Note since tests that extend this class do not use the normal metadata file, they should not be * used for regression test purposes. + * <p> + * Ideally the {@code phoneUtil} field (which uses test metadata) would be the only way that tests + * need to interact with a PhoneNumberUtil instance. However as some static methods in the library + * invoke "getInstance()" internally, we must also inject the test instance as the PhoneNumberUtil + * singleton. This means it is unsafe to run tests derived from this class in parallel with each + * other or at the same time as other tests which might require the singleton instance. * * @author Shaopeng Jia */ public class TestMetadataTestCase extends TestCase { - private static final String TEST_META_DATA_FILE_PREFIX = + private static final String TEST_METADATA_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting"; + /** An instance of PhoneNumberUtil that uses test metadata. */ protected final PhoneNumberUtil phoneUtil; public TestMetadataTestCase() { - phoneUtil = initializePhoneUtilForTesting(); + phoneUtil = new PhoneNumberUtil(new MultiFileMetadataSourceImpl(TEST_METADATA_FILE_PREFIX, + MetadataManager.DEFAULT_METADATA_LOADER), + CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap()); } - static PhoneNumberUtil initializePhoneUtilForTesting() { - PhoneNumberUtil phoneUtil = new PhoneNumberUtil( - new MultiFileMetadataSourceImpl(TEST_META_DATA_FILE_PREFIX, - PhoneNumberUtil.DEFAULT_METADATA_LOADER), - CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap()); + @Override + protected void setUp() throws Exception { + super.setUp(); PhoneNumberUtil.setInstance(phoneUtil); - return phoneUtil; + } + + @Override + protected void tearDown() throws Exception { + PhoneNumberUtil.setInstance(null); + super.tearDown(); } } diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 Binary files differindex cfaaeca9..bddead01 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 Binary files differindex 92cb48ae..a3dc070f 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD Binary files differindex 42e2c857..812b26f2 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE Binary files differindex 79aeb163..2885a82e 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AM b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AM Binary files differnew file mode 100644 index 00000000..3ddd501d --- /dev/null +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AM diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO Binary files differindex 3b33ecc0..181be521 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR Binary files differindex e8eee835..7400d308 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU Binary files differindex ef6e385b..6a6c8d10 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB Binary files differindex 76b000cd..66220e10 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR Binary files differindex 22841767..f58329ef 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS Binary files differindex 301810e1..7aa62be2 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY Binary files differindex ac429201..1c991936 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA Binary files differindex 3be2c449..40187883 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC Binary files differindex 7547c46f..ffced62f 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN Binary files differindex 42970124..0d8c9a4e 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX Binary files differindex 7c76e172..138b61f9 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE Binary files differindex e55eebfd..926f1507 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR Binary files differindex c15c8cda..19933400 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB Binary files differindex 59c48618..f78b19f4 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG Binary files differindex b20aac7b..fa043670 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU Binary files differindex 43873a44..9e73b8c7 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT Binary files differindex 6f46a990..57e3abce 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP Binary files differindex 14180614..3ff9cf70 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR Binary files differindex fc352035..afedb126 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX Binary files differindex 9151ddc1..bd1fe5b9 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ Binary files differindex 554b8002..4e411265 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL Binary files differindex da93e753..311beb06 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE Binary files differindex 435ecc0b..f63863ff 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE Binary files differindex 7e9e68b7..3474cd7a 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG Binary files differindex 1f13cb27..c26c677a 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US Binary files differindex 6ee41783..fd2e7612 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT Binary files differindex aa7469b2..00e129aa 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT |