Skip to content

Commit fabcc1d

Browse files
committed
Run codemod-unittest-to-pytest-asserts
1 parent c20a22f commit fabcc1d

File tree

3 files changed

+277
-380
lines changed

3 files changed

+277
-380
lines changed

tests/database_test.py

+69-77
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_language_list(self) -> None:
2323
)
2424
record = reader.country("81.2.69.160")
2525

26-
self.assertEqual(record.country.name, "Великобритания")
26+
assert record.country.name == "Великобритания"
2727
reader.close()
2828

2929
def test_unknown_address(self) -> None:
@@ -41,7 +41,7 @@ def test_unknown_address_network(self) -> None:
4141
reader.city("10.10.10.10")
4242
self.fail("Expected AddressNotFoundError")
4343
except geoip2.errors.AddressNotFoundError as e:
44-
self.assertEqual(e.network, ipaddress.ip_network("10.0.0.0/8"))
44+
assert e.network == ipaddress.ip_network("10.0.0.0/8")
4545
except Exception as e:
4646
self.fail(f"Expected AddressNotFoundError, got {type(e)}: {str(e)}")
4747
finally:
@@ -71,14 +71,14 @@ def test_anonymous_ip(self) -> None:
7171
ip_address = "1.2.0.1"
7272

7373
record = reader.anonymous_ip(ip_address)
74-
self.assertEqual(record.is_anonymous, True)
75-
self.assertEqual(record.is_anonymous_vpn, True)
76-
self.assertEqual(record.is_hosting_provider, False)
77-
self.assertEqual(record.is_public_proxy, False)
78-
self.assertEqual(record.is_residential_proxy, False)
79-
self.assertEqual(record.is_tor_exit_node, False)
80-
self.assertEqual(record.ip_address, ip_address)
81-
self.assertEqual(record.network, ipaddress.ip_network("1.2.0.0/16"))
74+
assert record.is_anonymous is True
75+
assert record.is_anonymous_vpn is True
76+
assert record.is_hosting_provider is False
77+
assert record.is_public_proxy is False
78+
assert record.is_residential_proxy is False
79+
assert record.is_tor_exit_node is False
80+
assert record.ip_address == ip_address
81+
assert record.network == ipaddress.ip_network("1.2.0.0/16")
8282
reader.close()
8383

8484
def test_anonymous_ip_all_set(self) -> None:
@@ -88,14 +88,14 @@ def test_anonymous_ip_all_set(self) -> None:
8888
ip_address = "81.2.69.1"
8989

9090
record = reader.anonymous_ip(ip_address)
91-
self.assertEqual(record.is_anonymous, True)
92-
self.assertEqual(record.is_anonymous_vpn, True)
93-
self.assertEqual(record.is_hosting_provider, True)
94-
self.assertEqual(record.is_public_proxy, True)
95-
self.assertEqual(record.is_residential_proxy, True)
96-
self.assertEqual(record.is_tor_exit_node, True)
97-
self.assertEqual(record.ip_address, ip_address)
98-
self.assertEqual(record.network, ipaddress.ip_network("81.2.69.0/24"))
91+
assert record.is_anonymous is True
92+
assert record.is_anonymous_vpn is True
93+
assert record.is_hosting_provider is True
94+
assert record.is_public_proxy is True
95+
assert record.is_residential_proxy is True
96+
assert record.is_tor_exit_node is True
97+
assert record.ip_address == ip_address
98+
assert record.network == ipaddress.ip_network("81.2.69.0/24")
9999
reader.close()
100100

101101
def test_asn(self) -> None:
@@ -104,12 +104,12 @@ def test_asn(self) -> None:
104104
ip_address = "1.128.0.0"
105105
record = reader.asn(ip_address)
106106

107-
self.assertEqual(record, eval(repr(record)), "ASN repr can be eval'd")
107+
assert record == eval(repr(record)), "ASN repr can be eval'd"
108108

109-
self.assertEqual(record.autonomous_system_number, 1221)
110-
self.assertEqual(record.autonomous_system_organization, "Telstra Pty Ltd")
111-
self.assertEqual(record.ip_address, ip_address)
112-
self.assertEqual(record.network, ipaddress.ip_network("1.128.0.0/11"))
109+
assert record.autonomous_system_number == 1221
110+
assert record.autonomous_system_organization == "Telstra Pty Ltd"
111+
assert record.ip_address == ip_address
112+
assert record.network == ipaddress.ip_network("1.128.0.0/11")
113113

114114
self.assertRegex(
115115
str(record),
@@ -123,18 +123,16 @@ def test_city(self) -> None:
123123
reader = geoip2.database.Reader("tests/data/test-data/GeoIP2-City-Test.mmdb")
124124
record = reader.city("81.2.69.160")
125125

126-
self.assertEqual(
127-
record.country.name, "United Kingdom", "The default locale is en"
128-
)
129-
self.assertEqual(record.country.is_in_european_union, False)
130-
self.assertEqual(
131-
record.location.accuracy_radius, 100, "The accuracy_radius is populated"
132-
)
133-
self.assertEqual(record.registered_country.is_in_european_union, False)
134-
self.assertFalse(record.traits.is_anycast)
126+
assert record.country.name == "United Kingdom", "The default locale is en"
127+
assert record.country.is_in_european_union is False
128+
assert (
129+
record.location.accuracy_radius == 100
130+
), "The accuracy_radius is populated"
131+
assert record.registered_country.is_in_european_union is False
132+
assert not record.traits.is_anycast
135133

136134
record = reader.city("214.1.1.0")
137-
self.assertTrue(record.traits.is_anycast)
135+
assert record.traits.is_anycast
138136

139137
reader.close()
140138

@@ -146,13 +144,11 @@ def test_connection_type(self) -> None:
146144

147145
record = reader.connection_type(ip_address)
148146

149-
self.assertEqual(
150-
record, eval(repr(record)), "ConnectionType repr can be eval'd"
151-
)
147+
assert record == eval(repr(record)), "ConnectionType repr can be eval'd"
152148

153-
self.assertEqual(record.connection_type, "Cellular")
154-
self.assertEqual(record.ip_address, ip_address)
155-
self.assertEqual(record.network, ipaddress.ip_network("1.0.1.0/24"))
149+
assert record.connection_type == "Cellular"
150+
assert record.ip_address == ip_address
151+
assert record.network == ipaddress.ip_network("1.0.1.0/24")
156152

157153
self.assertRegex(
158154
str(record),
@@ -165,16 +161,14 @@ def test_connection_type(self) -> None:
165161
def test_country(self) -> None:
166162
reader = geoip2.database.Reader("tests/data/test-data/GeoIP2-Country-Test.mmdb")
167163
record = reader.country("81.2.69.160")
168-
self.assertEqual(
169-
record.traits.ip_address, "81.2.69.160", "IP address is added to model"
170-
)
171-
self.assertEqual(record.traits.network, ipaddress.ip_network("81.2.69.160/27"))
172-
self.assertEqual(record.country.is_in_european_union, False)
173-
self.assertEqual(record.registered_country.is_in_european_union, False)
174-
self.assertFalse(record.traits.is_anycast)
164+
assert record.traits.ip_address == "81.2.69.160", "IP address is added to model"
165+
assert record.traits.network == ipaddress.ip_network("81.2.69.160/27")
166+
assert record.country.is_in_european_union is False
167+
assert record.registered_country.is_in_european_union is False
168+
assert not record.traits.is_anycast
175169

176170
record = reader.country("214.1.1.0")
177-
self.assertTrue(record.traits.is_anycast)
171+
assert record.traits.is_anycast
178172

179173
reader.close()
180174

@@ -184,11 +178,11 @@ def test_domain(self) -> None:
184178
ip_address = "1.2.0.0"
185179
record = reader.domain(ip_address)
186180

187-
self.assertEqual(record, eval(repr(record)), "Domain repr can be eval'd")
181+
assert record == eval(repr(record)), "Domain repr can be eval'd"
188182

189-
self.assertEqual(record.domain, "maxmind.com")
190-
self.assertEqual(record.ip_address, ip_address)
191-
self.assertEqual(record.network, ipaddress.ip_network("1.2.0.0/16"))
183+
assert record.domain == "maxmind.com"
184+
assert record.ip_address == ip_address
185+
assert record.network == ipaddress.ip_network("1.2.0.0/16")
192186

193187
self.assertRegex(
194188
str(record),
@@ -204,41 +198,39 @@ def test_enterprise(self) -> None:
204198
) as reader:
205199
ip_address = "74.209.24.0"
206200
record = reader.enterprise(ip_address)
207-
self.assertEqual(record.city.confidence, 11)
208-
self.assertEqual(record.country.confidence, 99)
209-
self.assertEqual(record.country.geoname_id, 6252001)
210-
self.assertEqual(record.country.is_in_european_union, False)
211-
self.assertEqual(record.location.accuracy_radius, 27)
212-
self.assertEqual(record.registered_country.is_in_european_union, False)
213-
self.assertEqual(record.traits.connection_type, "Cable/DSL")
214-
self.assertTrue(record.traits.is_legitimate_proxy)
215-
self.assertEqual(record.traits.ip_address, ip_address)
216-
self.assertEqual(
217-
record.traits.network, ipaddress.ip_network("74.209.16.0/20")
218-
)
219-
self.assertFalse(record.traits.is_anycast)
201+
assert record.city.confidence == 11
202+
assert record.country.confidence == 99
203+
assert record.country.geoname_id == 6252001
204+
assert record.country.is_in_european_union is False
205+
assert record.location.accuracy_radius == 27
206+
assert record.registered_country.is_in_european_union is False
207+
assert record.traits.connection_type == "Cable/DSL"
208+
assert record.traits.is_legitimate_proxy
209+
assert record.traits.ip_address == ip_address
210+
assert record.traits.network == ipaddress.ip_network("74.209.16.0/20")
211+
assert not record.traits.is_anycast
220212

221213
record = reader.enterprise("149.101.100.0")
222-
self.assertEqual(record.traits.mobile_country_code, "310")
223-
self.assertEqual(record.traits.mobile_network_code, "004")
214+
assert record.traits.mobile_country_code == "310"
215+
assert record.traits.mobile_network_code == "004"
224216

225217
record = reader.enterprise("214.1.1.0")
226-
self.assertTrue(record.traits.is_anycast)
218+
assert record.traits.is_anycast
227219

228220
def test_isp(self) -> None:
229221
with geoip2.database.Reader(
230222
"tests/data/test-data/GeoIP2-ISP-Test.mmdb"
231223
) as reader:
232224
ip_address = "1.128.0.0"
233225
record = reader.isp(ip_address)
234-
self.assertEqual(record, eval(repr(record)), "ISP repr can be eval'd")
226+
assert record == eval(repr(record)), "ISP repr can be eval'd"
235227

236-
self.assertEqual(record.autonomous_system_number, 1221)
237-
self.assertEqual(record.autonomous_system_organization, "Telstra Pty Ltd")
238-
self.assertEqual(record.isp, "Telstra Internet")
239-
self.assertEqual(record.organization, "Telstra Internet")
240-
self.assertEqual(record.ip_address, ip_address)
241-
self.assertEqual(record.network, ipaddress.ip_network("1.128.0.0/11"))
228+
assert record.autonomous_system_number == 1221
229+
assert record.autonomous_system_organization == "Telstra Pty Ltd"
230+
assert record.isp == "Telstra Internet"
231+
assert record.organization == "Telstra Internet"
232+
assert record.ip_address == ip_address
233+
assert record.network == ipaddress.ip_network("1.128.0.0/11")
242234

243235
self.assertRegex(
244236
str(record),
@@ -248,15 +240,15 @@ def test_isp(self) -> None:
248240

249241
record = reader.isp("149.101.100.0")
250242

251-
self.assertEqual(record.mobile_country_code, "310")
252-
self.assertEqual(record.mobile_network_code, "004")
243+
assert record.mobile_country_code == "310"
244+
assert record.mobile_network_code == "004"
253245

254246
def test_context_manager(self) -> None:
255247
with geoip2.database.Reader(
256248
"tests/data/test-data/GeoIP2-Country-Test.mmdb"
257249
) as reader:
258250
record = reader.country("81.2.69.160")
259-
self.assertEqual(record.traits.ip_address, "81.2.69.160")
251+
assert record.traits.ip_address == "81.2.69.160"
260252

261253
@patch("maxminddb.open_database")
262254
def test_modes(self, mock_open) -> None:

0 commit comments

Comments
 (0)