Skip to content

Commit 948c91b

Browse files
daviddrysdaledaviddrysdale
committed
Move tests to use accessors
1 parent 2c1e6ef commit 948c91b

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎python/tests/examplenumberstest.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def testSharedCost(self):
120120
def testCanBeInternationallyDialled(self):
121121
for regionCode in phonenumberutil.SUPPORTED_REGIONS:
122122
exampleNumber = None
123-
metadata = PhoneMetadata.region_metadata.get(regionCode, None)
123+
metadata = PhoneMetadata.metadata_for_region(regionCode, None)
124124
desc = None
125125
if metadata is not None:
126126
desc = metadata.no_international_dialling
@@ -140,7 +140,7 @@ def testCanBeInternationallyDialled(self):
140140
def testEmergency(self):
141141
wrongTypeCounter = 0
142142
for regionCode in phonenumberutil.SUPPORTED_REGIONS:
143-
metadata = PhoneMetadata.region_metadata.get(regionCode, None)
143+
metadata = PhoneMetadata.metadata_for_region(regionCode, None)
144144
desc = metadata.emergency
145145
if desc.example_number is not None:
146146
exampleNumber = desc.example_number
@@ -151,7 +151,7 @@ def testEmergency(self):
151151
self.assertEqual(0, wrongTypeCounter)
152152

153153
def testGlobalNetworkNumbers(self):
154-
for callingCode in PhoneMetadata.country_code_metadata.keys():
154+
for callingCode in PhoneMetadata.country_code_available.keys():
155155
exampleNumber = phonenumberutil.example_number_for_non_geo_entity(callingCode)
156156
self.assertTrue(exampleNumber is not None,
157157
msg="No example phone number for calling code %s" % callingCode)

‎python/tests/phonenumberutiltest.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def testSupportedRegions(self):
9898
self.assertTrue("BS" in phonenumbers.SUPPORTED_REGIONS)
9999

100100
def testGetInstanceLoadUSMetadata(self):
101-
metadata = PhoneMetadata.region_metadata["US"]
101+
metadata = PhoneMetadata.metadata_for_region("US")
102102
self.assertEqual("US", metadata.id)
103103
self.assertEqual(1, metadata.country_code)
104104
self.assertEqual("011", metadata.international_prefix)
@@ -117,7 +117,7 @@ def testGetInstanceLoadUSMetadata(self):
117117
self.assertEqual("NA", metadata.shared_cost.possible_number_pattern)
118118

119119
def testGetInstanceLoadDEMetadata(self):
120-
metadata = PhoneMetadata.region_metadata["DE"]
120+
metadata = PhoneMetadata.metadata_for_region("DE")
121121
self.assertEqual("DE", metadata.id)
122122
self.assertEqual(49, metadata.country_code)
123123
self.assertEqual("00", metadata.international_prefix)
@@ -136,7 +136,7 @@ def testGetInstanceLoadDEMetadata(self):
136136
self.assertEqual("900([135]\\d{6}|9\\d{7})", metadata.premium_rate.national_number_pattern)
137137

138138
def testGetInstanceLoadARMetadata(self):
139-
metadata = PhoneMetadata.region_metadata["AR"]
139+
metadata = PhoneMetadata.metadata_for_region("AR")
140140
self.assertEqual("AR", metadata.id)
141141
self.assertEqual(54, metadata.country_code)
142142
self.assertEqual("00", metadata.international_prefix)
@@ -151,7 +151,7 @@ def testGetInstanceLoadARMetadata(self):
151151
self.assertEqual("\\1 \\2 \\3 \\4", metadata.intl_number_format[3].format)
152152

153153
def testGetInstanceLoadInternationalTollFreeMetadata(self):
154-
metadata = PhoneMetadata.country_code_metadata[800]
154+
metadata = PhoneMetadata.metadata_for_nongeo_region(800)
155155
self.assertEqual("001", metadata.id)
156156
self.assertEqual(800, metadata.country_code)
157157
self.assertEqual("\\1 \\2", metadata.number_format[0].format)
@@ -1408,7 +1408,7 @@ def testMaybeStripInternationalPrefix(self):
14081408

14091409
def testMaybeExtractCountryCode(self):
14101410
number = PhoneNumber()
1411-
metadata = PhoneMetadata.region_metadata["US"]
1411+
metadata = PhoneMetadata.metadata_for_region("US")
14121412
# Note that for the US, the IDD is 011.
14131413
try:
14141414
phoneNumber = "011112-3456789"
@@ -2424,7 +2424,7 @@ def testMetadataImmutable(self):
24242424

24252425
def testMetadataAsString(self):
24262426
# Python version extra tests for string conversions
2427-
metadata = PhoneMetadata.region_metadata["AU"]
2427+
metadata = PhoneMetadata.metadata_for_region("AU")
24282428
self.assertEqual('\\' + 'd',
24292429
metadata.number_format[0].pattern[1:3])
24302430
self.assertEqual(r"""NumberFormat(pattern='(\\d{4})(\\d{3})(\\d{3})', format=%(u)s'\\1 \\2 \\3', leading_digits_pattern=['1'], national_prefix_formatting_rule=%(u)s'\\1')""" % {'u': _UP},
@@ -2506,7 +2506,7 @@ def testMetadataAsString(self):
25062506

25072507
def testMetadataEval(self):
25082508
# Python version extra tests for string conversions
2509-
metadata = PhoneMetadata.region_metadata["AU"]
2509+
metadata = PhoneMetadata.metadata_for_region("AU")
25102510
new_number_format = eval(repr(metadata.number_format[0]))
25112511
self.assertEqual(new_number_format, metadata.number_format[0])
25122512
new_general_desc = eval(repr(metadata.general_desc))
@@ -2533,7 +2533,7 @@ def testCoverage(self):
25332533
self.assertTrue(phonenumberutil._region_code_for_number_from_list(GB_NUMBER, ("XX",)) is None)
25342534
self.assertEqual((0, "abcdef"),
25352535
phonenumberutil._extract_country_code("abcdef"))
2536-
metadata = PhoneMetadata.region_metadata["AU"]
2536+
metadata = PhoneMetadata.metadata_for_region("AU")
25372537
number = PhoneNumber()
25382538
self.assertEqual((0, u""),
25392539
phonenumberutil._maybe_extract_country_code("",
@@ -2558,7 +2558,7 @@ def testCoverage(self):
25582558
metadataXY))
25592559

25602560
# Temporarily insert invalid example number
2561-
metadata800 = PhoneMetadata.country_code_metadata[800]
2561+
metadata800 = PhoneMetadata.metadata_for_nongeo_region(800)
25622562
saved_example = metadata800.general_desc.example_number
25632563
metadata800.general_desc._mutable = True
25642564
metadata800.general_desc.example_number = ''
@@ -2569,7 +2569,7 @@ def testCoverage(self):
25692569
self.assertFalse(phonenumbers.phonenumberutil._raw_input_contains_national_prefix("07", "0", "JP"))
25702570

25712571
# Temporarily change formatting rule
2572-
metadataGB = PhoneMetadata.region_metadata["GB"]
2572+
metadataGB = PhoneMetadata.metadata_for_region("GB")
25732573
saved_rule = metadataGB.number_format[0].national_prefix_formatting_rule
25742574
metadataGB.number_format[0]._mutable = True
25752575
metadataGB.number_format[0].national_prefix_formatting_rule = u'(\\1)'

0 commit comments

Comments
 (0)