From 37c00b2e3c86b66820d8dd06ceaa1f501950a804 Mon Sep 17 00:00:00 2001 From: penmetsaa Date: Fri, 10 Jun 2022 12:53:16 +0530 Subject: [PATCH 1/2] Update phonenumberutiltest.py --- python/tests/phonenumberutiltest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/tests/phonenumberutiltest.py b/python/tests/phonenumberutiltest.py index 91624ab46..dd2cd4482 100755 --- a/python/tests/phonenumberutiltest.py +++ b/python/tests/phonenumberutiltest.py @@ -2978,19 +2978,19 @@ def testIsMobileNumberPortableRegion(self): self.assertFalse(phonenumbers.is_mobile_number_portable_region("XY")) def testGetMetadataForRegionForNonGeoEntity_shouldBeNull(self): - self.assertTrue(PhoneMetadata.metadata_for_region("001") is None) + self.assertIs(PhoneMetadata.metadata_for_region("001"), None) def testGetMetadataForRegionForUnknownRegion_shouldBeNull(self): - self.assertTrue(PhoneMetadata.metadata_for_region("ZZ") is None) + self.assertIs(PhoneMetadata.metadata_for_region("ZZ"), None) def testGetMetadataForNonGeographicalRegionForGeoRegion_shouldBeNull(self): - self.assertTrue(PhoneMetadata.metadata_for_nongeo_region(country_code=1) is None) + self.assertIs(PhoneMetadata.metadata_for_nongeo_region(country_code=1), None) def testGetMetadataForRegionForMissingMetadata(self): - self.assertTrue(PhoneMetadata.metadata_for_region("YYZ") is None) + self.assertIs(PhoneMetadata.metadata_for_region("YYZ"), None) def testGetMetadataForNonGeographicalRegionForMissingMetadata(self): - self.assertTrue(PhoneMetadata.metadata_for_nongeo_region("800000") is None) + self.assertIs(PhoneMetadata.metadata_for_nongeo_region("800000"), None) def testMetadataEquality(self): # Python version extra tests for equality against other types From 3fb7cc04e2069f355d69c0de81f3a310491f3522 Mon Sep 17 00:00:00 2001 From: penmetsaa Date: Fri, 10 Jun 2022 18:51:08 +0530 Subject: [PATCH 2/2] Update phonenumberutiltest.py Making similar changes in other cases also. --- python/tests/phonenumberutiltest.py | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/python/tests/phonenumberutiltest.py b/python/tests/phonenumberutiltest.py index dd2cd4482..fbe851855 100755 --- a/python/tests/phonenumberutiltest.py +++ b/python/tests/phonenumberutiltest.py @@ -139,7 +139,7 @@ def testGetInstanceLoadUSMetadata(self): self.assertEqual("US", metadata.id) self.assertEqual(1, metadata.country_code) self.assertEqual("011", metadata.international_prefix) - self.assertTrue(metadata.national_prefix is not None) + self.assertIsNotNone(metadata.national_prefix) self.assertEqual(2, len(metadata.number_format)) self.assertEqual("(\\d{3})(\\d{3})(\\d{4})", metadata.number_format[1].pattern) self.assertEqual("\\1 \\2 \\3", metadata.number_format[1].format) @@ -324,26 +324,26 @@ def testGetExampleNumber(self): # Should return the same response if asked for FIXED_LINE_OR_MOBILE too. self.assertEqual(DE_NUMBER, phonenumbers.example_number_for_type("DE", PhoneNumberType.FIXED_LINE_OR_MOBILE)) - self.assertTrue(phonenumbers.example_number_for_type("US", PhoneNumberType.FIXED_LINE) is not None) - self.assertTrue(phonenumbers.example_number_for_type("US", PhoneNumberType.MOBILE) is not None) + self.assertIsNotNone(phonenumbers.example_number_for_type("US", PhoneNumberType.FIXED_LINE)) + self.assertIsNotNone(phonenumbers.example_number_for_type("US", PhoneNumberType.MOBILE)) # We have data for the US, but no data for VOICEMAIL, so return null. - self.assertTrue(phonenumbers.example_number_for_type("US", PhoneNumberType.VOICEMAIL) is None) + self.assertIsNone(phonenumbers.example_number_for_type("US", PhoneNumberType.VOICEMAIL)) # CS is an invalid region, so we have no data for it. - self.assertTrue(phonenumbers.example_number_for_type("CS", PhoneNumberType.MOBILE) is None) + self.assertIsNone(phonenumbers.example_number_for_type("CS", PhoneNumberType.MOBILE)) # Python version extra test - self.assertTrue(phonenumbers.example_number_for_type("US", PhoneNumberType.UNKNOWN) is None) + self.assertIsNone(phonenumbers.example_number_for_type("US", PhoneNumberType.UNKNOWN)) # RegionCode 001 is reserved for supporting non-geographical country # calling code. We don't support getting an example number for it with # this method. - self.assertTrue(phonenumbers.example_number("001") is None) + self.assertIsNone(phonenumbers.example_number("001")) def testGetInvalidExampleNumber(self): # RegionCode 001 is reserved for supporting non-geographical country # calling codes. We don't support getting an invalid example number # for it with invalid_example_number. - self.assertTrue(phonenumbers.invalid_example_number("001") is None) - self.assertTrue(phonenumbers.invalid_example_number("CS") is None) + self.assertIsNone(phonenumbers.invalid_example_number("001")) + self.assertIsNone(phonenumbers.invalid_example_number("CS")) usInvalidNumber = phonenumbers.invalid_example_number("US") self.assertEqual(1, usInvalidNumber.country_code) self.assertFalse(usInvalidNumber.national_number == 0) @@ -352,18 +352,18 @@ def testGetExampleNumberForNonGeoEntity(self): self.assertEqual(INTERNATIONAL_TOLL_FREE, phonenumbers.example_number_for_non_geo_entity(800)) self.assertEqual(UNIVERSAL_PREMIUM_RATE, phonenumbers.example_number_for_non_geo_entity(979)) # Python version extra test - self.assertTrue(phonenumbers.example_number_for_non_geo_entity(666) is None) + self.assertIsNone(phonenumbers.example_number_for_non_geo_entity(666)) def testGetExampleNumberWithoutRegion(self): # In our test metadata we don't cover all types: in our real metadata, we do. - self.assertTrue(phonenumbers.example_number_for_type(None, PhoneNumberType.FIXED_LINE) is not None) - self.assertTrue(phonenumbers.example_number_for_type(None, PhoneNumberType.MOBILE) is not None) - self.assertTrue(phonenumbers.example_number_for_type(None, PhoneNumberType.PREMIUM_RATE) is not None) + self.assertIsNotNone(phonenumbers.example_number_for_type(None, PhoneNumberType.FIXED_LINE)) + self.assertIsNotNone(phonenumbers.example_number_for_type(None, PhoneNumberType.MOBILE)) + self.assertIsNotNone(phonenumbers.example_number_for_type(None, PhoneNumberType.PREMIUM_RATE)) # Python version extra test: temporarily drop SUPPORTED_REGIONS to check # that example_number_for_type() falls back to non-geo numbers. saved = phonenumberutil.SUPPORTED_REGIONS phonenumberutil.SUPPORTED_REGIONS = set() - self.assertTrue(phonenumbers.example_number_for_type(None, PhoneNumberType.TOLL_FREE) is not None) + self.assertIsNotNone(phonenumbers.example_number_for_type(None, PhoneNumberType.TOLL_FREE)) phonenumberutil.SUPPORTED_REGIONS = saved def testConvertAlphaCharactersInNumber(self): @@ -1285,7 +1285,7 @@ def testGetNationalDiallingPrefixForRegion(self): self.assertEqual(None, phonenumbers.ndd_prefix_for_region("CS", False)) # Python version extra test # IT has no national prefix - self.assertTrue(phonenumbers.ndd_prefix_for_region("IT", False) is None) + self.assertIsNone(phonenumbers.ndd_prefix_for_region("IT", False)) def testIsNANPACountry(self): self.assertTrue(phonenumbers.is_nanpa_country("US")) @@ -2978,19 +2978,19 @@ def testIsMobileNumberPortableRegion(self): self.assertFalse(phonenumbers.is_mobile_number_portable_region("XY")) def testGetMetadataForRegionForNonGeoEntity_shouldBeNull(self): - self.assertIs(PhoneMetadata.metadata_for_region("001"), None) + self.assertIsNone(PhoneMetadata.metadata_for_region("001")) def testGetMetadataForRegionForUnknownRegion_shouldBeNull(self): - self.assertIs(PhoneMetadata.metadata_for_region("ZZ"), None) + self.assertIsNone(PhoneMetadata.metadata_for_region("ZZ")) def testGetMetadataForNonGeographicalRegionForGeoRegion_shouldBeNull(self): - self.assertIs(PhoneMetadata.metadata_for_nongeo_region(country_code=1), None) + self.assertIsNone(PhoneMetadata.metadata_for_nongeo_region(country_code=1)) def testGetMetadataForRegionForMissingMetadata(self): - self.assertIs(PhoneMetadata.metadata_for_region("YYZ"), None) + self.assertIsNone(PhoneMetadata.metadata_for_region("YYZ")) def testGetMetadataForNonGeographicalRegionForMissingMetadata(self): - self.assertIs(PhoneMetadata.metadata_for_nongeo_region("800000"), None) + self.assertIsNone(PhoneMetadata.metadata_for_nongeo_region("800000")) def testMetadataEquality(self): # Python version extra tests for equality against other types @@ -3184,7 +3184,7 @@ def testMetadataRegister(self): self.assertRaises(Exception, PhoneMetadata, *("XY",), **{'preferred_international_prefix': u('9999'), 'register': True}) - self.assertTrue(phonenumbers.example_number_for_type('XY', PhoneNumberType.PERSONAL_NUMBER) is None) + self.assertIsNone(phonenumbers.example_number_for_type('XY', PhoneNumberType.PERSONAL_NUMBER)) def testShortMetadataRegister(self): # Python version extra tests for short metadata registration. @@ -3210,7 +3210,7 @@ def testShortMetadataRegister(self): **{'preferred_international_prefix': u('9999'), 'register': True, 'short_data': True}) - self.assertTrue(phonenumbers.example_number_for_type('XZ', PhoneNumberType.PERSONAL_NUMBER) is None) + self.assertIsNone(phonenumbers.example_number_for_type('XZ', PhoneNumberType.PERSONAL_NUMBER)) def testNonGeoMetadataRegister(self): # Python version extra tests for non-geo metadata registration. @@ -3280,7 +3280,7 @@ def testEnumString(self): def testCoverage(self): # Python version extra tests - self.assertTrue(phonenumberutil._region_code_for_number_from_list(GB_NUMBER, ("XX",)) is None) + self.assertIsNone(phonenumberutil._region_code_for_number_from_list(GB_NUMBER, ("XX",))) self.assertEqual((0, "abcdef"), phonenumberutil._extract_country_code("abcdef")) metadata = PhoneMetadata.metadata_for_region("AU") @@ -3311,7 +3311,7 @@ def testCoverage(self): saved_mobile = metadata800.mobile metadata800._mutable = True metadata800.mobile = PhoneNumberDesc(example_number='') - self.assertTrue(phonenumbers.example_number_for_non_geo_entity(800) is not None) + self.assertIsNotNone(phonenumbers.example_number_for_non_geo_entity(800)) metadata800.mobile = saved_mobile metadata800._mutable = False