Skip to content

Commit 8247797

Browse files
knaperekknaperek
authored
Merge pull request #97 from jdufresne/assert-equal
Use assertEqual() instead of deprecated assertEquals() in tests
2 parents ac8311f + 74fb772 commit 8247797

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

‎djangosaml2/tests/__init__.py

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ def remove_variable_attributes(xml_string):
8484

8585
return xml_string
8686

87-
self.assertEquals(remove_variable_attributes(real_xml),
88-
remove_variable_attributes(expected_xmls))
87+
self.assertEqual(remove_variable_attributes(real_xml),
88+
remove_variable_attributes(expected_xmls))
8989

9090
def init_cookies(self):
9191
self.client.cookies[settings.SESSION_COOKIE_NAME] = 'testing'
@@ -119,7 +119,7 @@ def test_login_evil_redirect(self):
119119
url = urlparse(response['Location'])
120120
params = parse_qs(url.query)
121121

122-
self.assertEquals(params['RelayState'], [settings.LOGIN_REDIRECT_URL, ])
122+
self.assertEqual(params['RelayState'], [settings.LOGIN_REDIRECT_URL, ])
123123

124124
def test_login_one_idp(self):
125125
# monkey patch SAML configuration
@@ -130,12 +130,12 @@ def test_login_one_idp(self):
130130
)
131131

132132
response = self.client.get(reverse('saml2_login'))
133-
self.assertEquals(response.status_code, 302)
133+
self.assertEqual(response.status_code, 302)
134134
location = response['Location']
135135

136136
url = urlparse(location)
137-
self.assertEquals(url.hostname, 'idp.example.com')
138-
self.assertEquals(url.path, '/simplesaml/saml2/idp/SSOService.php')
137+
self.assertEqual(url.hostname, 'idp.example.com')
138+
self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')
139139

140140
params = parse_qs(url.query)
141141
self.assert_('SAMLRequest' in params)
@@ -159,17 +159,17 @@ def test_login_one_idp(self):
159159
# in the RelayState argument
160160
next = '/another-view/'
161161
response = self.client.get(reverse('saml2_login'), {'next': next})
162-
self.assertEquals(response.status_code, 302)
162+
self.assertEqual(response.status_code, 302)
163163
location = response['Location']
164164

165165
url = urlparse(location)
166-
self.assertEquals(url.hostname, 'idp.example.com')
167-
self.assertEquals(url.path, '/simplesaml/saml2/idp/SSOService.php')
166+
self.assertEqual(url.hostname, 'idp.example.com')
167+
self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')
168168

169169
params = parse_qs(url.query)
170170
self.assert_('SAMLRequest' in params)
171171
self.assert_('RelayState' in params)
172-
self.assertEquals(params['RelayState'][0], next)
172+
self.assertEqual(params['RelayState'][0], next)
173173

174174
def test_login_several_idps(self):
175175
settings.SAML_CONFIG = conf.create_conf(
@@ -191,12 +191,12 @@ def test_login_several_idps(self):
191191
'idp': 'https://idp2.example.com/simplesaml/saml2/idp/metadata.php',
192192
'next': '/',
193193
})
194-
self.assertEquals(response.status_code, 302)
194+
self.assertEqual(response.status_code, 302)
195195
location = response['Location']
196196

197197
url = urlparse(location)
198-
self.assertEquals(url.hostname, 'idp2.example.com')
199-
self.assertEquals(url.path, '/simplesaml/saml2/idp/SSOService.php')
198+
self.assertEqual(url.hostname, 'idp2.example.com')
199+
self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')
200200

201201
params = parse_qs(url.query)
202202
self.assert_('SAMLRequest' in params)
@@ -237,15 +237,15 @@ def test_assertion_consumer_service(self):
237237
'SAMLResponse': self.b64_for_post(saml_response),
238238
'RelayState': came_from,
239239
})
240-
self.assertEquals(response.status_code, 302)
240+
self.assertEqual(response.status_code, 302)
241241
location = response['Location']
242242
url = urlparse(location)
243-
self.assertEquals(url.path, came_from)
243+
self.assertEqual(url.path, came_from)
244244

245-
self.assertEquals(User.objects.count(), initial_user_count + 1)
245+
self.assertEqual(User.objects.count(), initial_user_count + 1)
246246
user_id = self.client.session[SESSION_KEY]
247247
user = User.objects.get(id=user_id)
248-
self.assertEquals(user.username, 'student')
248+
self.assertEqual(user.username, 'student')
249249

250250
# let's create another user and log in with that one
251251
new_user = User.objects.create(username='teacher', password='not-used')
@@ -258,13 +258,13 @@ def test_assertion_consumer_service(self):
258258
'SAMLResponse': self.b64_for_post(saml_response),
259259
'RelayState': came_from,
260260
})
261-
self.assertEquals(response.status_code, 302)
261+
self.assertEqual(response.status_code, 302)
262262
location = response['Location']
263263

264264
url = urlparse(location)
265265
# as the RelayState is empty we have redirect to LOGIN_REDIRECT_URL
266-
self.assertEquals(url.path, settings.LOGIN_REDIRECT_URL)
267-
self.assertEquals(force_text(new_user.id), self.client.session[SESSION_KEY])
266+
self.assertEqual(url.path, settings.LOGIN_REDIRECT_URL)
267+
self.assertEqual(force_text(new_user.id), self.client.session[SESSION_KEY])
268268

269269
def test_missing_param_to_assertion_consumer_service_request(self):
270270
# Send request without SAML2Response parameter
@@ -293,7 +293,7 @@ def do_login(self):
293293
'SAMLResponse': self.b64_for_post(saml_response),
294294
'RelayState': came_from,
295295
})
296-
self.assertEquals(response.status_code, 302)
296+
self.assertEqual(response.status_code, 302)
297297

298298
@skip("This is a known issue caused by pysaml2. Needs more investigation. Fixes are welcome.")
299299
def test_logout(self):
@@ -305,13 +305,13 @@ def test_logout(self):
305305
self.do_login()
306306

307307
response = self.client.get(reverse('saml2_logout'))
308-
self.assertEquals(response.status_code, 302)
308+
self.assertEqual(response.status_code, 302)
309309
location = response['Location']
310310

311311
url = urlparse(location)
312-
self.assertEquals(url.hostname, 'idp.example.com')
313-
self.assertEquals(url.path,
314-
'/simplesaml/saml2/idp/SingleLogoutService.php')
312+
self.assertEqual(url.hostname, 'idp.example.com')
313+
self.assertEqual(url.path,
314+
'/simplesaml/saml2/idp/SingleLogoutService.php')
315315

316316
params = parse_qs(url.query)
317317
self.assert_('SAMLRequest' in params)
@@ -339,13 +339,13 @@ def test_logout_service_local(self):
339339
self.do_login()
340340

341341
response = self.client.get(reverse('saml2_logout'))
342-
self.assertEquals(response.status_code, 302)
342+
self.assertEqual(response.status_code, 302)
343343
location = response['Location']
344344

345345
url = urlparse(location)
346-
self.assertEquals(url.hostname, 'idp.example.com')
347-
self.assertEquals(url.path,
348-
'/simplesaml/saml2/idp/SingleLogoutService.php')
346+
self.assertEqual(url.hostname, 'idp.example.com')
347+
self.assertEqual(url.path,
348+
'/simplesaml/saml2/idp/SingleLogoutService.php')
349349

350350
params = parse_qs(url.query)
351351
self.assert_('SAMLRequest' in params)
@@ -374,7 +374,7 @@ def test_logout_service_local(self):
374374
'SAMLResponse': deflate_and_base64_encode(saml_response),
375375
})
376376
self.assertContains(response, "Logged out", status_code=200)
377-
self.assertEquals(self.client.session.keys(), [])
377+
self.assertEqual(self.client.session.keys(), [])
378378

379379
def test_logout_service_global(self):
380380
settings.SAML_CONFIG = conf.create_conf(
@@ -394,13 +394,13 @@ def test_logout_service_global(self):
394394
response = self.client.get(reverse('saml2_ls'), {
395395
'SAMLRequest': deflate_and_base64_encode(saml_request),
396396
})
397-
self.assertEquals(response.status_code, 302)
397+
self.assertEqual(response.status_code, 302)
398398
location = response['Location']
399399

400400
url = urlparse(location)
401-
self.assertEquals(url.hostname, 'idp.example.com')
402-
self.assertEquals(url.path,
403-
'/simplesaml/saml2/idp/SingleLogoutService.php')
401+
self.assertEqual(url.hostname, 'idp.example.com')
402+
self.assertEqual(url.path,
403+
'/simplesaml/saml2/idp/SingleLogoutService.php')
404404

405405
params = parse_qs(url.query)
406406
self.assert_('SAMLResponse' in params)
@@ -513,14 +513,14 @@ def _test_metadata(self):
513513
expected_metadata = expected_metadata % valid_until
514514

515515
response = self.client.get('/metadata/')
516-
self.assertEquals(response['Content-type'], 'text/xml; charset=utf8')
517-
self.assertEquals(response.status_code, 200)
518-
self.assertEquals(response.content, expected_metadata)
516+
self.assertEqual(response['Content-type'], 'text/xml; charset=utf8')
517+
self.assertEqual(response.status_code, 200)
518+
self.assertEqual(response.content, expected_metadata)
519519

520520
def test_post_authenticated_signal(self):
521521

522522
def signal_handler(signal, user, session_info):
523-
self.assertEquals(isinstance(user, User), True)
523+
self.assertEqual(isinstance(user, User), True)
524524

525525
post_authenticated.connect(signal_handler, dispatch_uid='test_signal')
526526

@@ -577,7 +577,7 @@ def test_custom_conf_loader(self):
577577
request = RequestFactory().get('/bar/foo')
578578
conf = get_config(config_loader_path, request)
579579

580-
self.assertEquals(conf.entityid, 'testentity')
580+
self.assertEqual(conf.entityid, 'testentity')
581581

582582
def test_custom_conf_loader_from_view(self):
583583
config_loader_path = 'djangosaml2.tests.test_config_loader_with_real_conf'
@@ -587,9 +587,9 @@ def test_custom_conf_loader_from_view(self):
587587
middleware.process_request(request)
588588
request.session.save()
589589
response = views.login(request, config_loader_path)
590-
self.assertEquals(response.status_code, 302)
590+
self.assertEqual(response.status_code, 302)
591591
location = response['Location']
592592

593593
url = urlparse(location)
594-
self.assertEquals(url.hostname, 'idp.example.com')
595-
self.assertEquals(url.path, '/simplesaml/saml2/idp/SSOService.php')
594+
self.assertEqual(url.hostname, 'idp.example.com')
595+
self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')

‎tests/testprofiles/tests.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ def test_update_user(self):
5353
'sn': ('Doe', ),
5454
}
5555
backend.update_user(user, attributes, attribute_mapping)
56-
self.assertEquals(user.email, '[email protected]')
57-
self.assertEquals(user.first_name, 'John')
58-
self.assertEquals(user.last_name, 'Doe')
56+
self.assertEqual(user.email, '[email protected]')
57+
self.assertEqual(user.first_name, 'John')
58+
self.assertEqual(user.last_name, 'Doe')
5959

6060
# now we create a user profile and link it to the user
6161
if django.VERSION < (1, 7):
@@ -67,9 +67,9 @@ def test_update_user(self):
6767
backend.update_user(user, attributes, attribute_mapping)
6868

6969
if django.VERSION < (1, 7):
70-
self.assertEquals(user.get_profile().age, '22')
70+
self.assertEqual(user.get_profile().age, '22')
7171
else:
72-
self.assertEquals(user.age, '22')
72+
self.assertEqual(user.age, '22')
7373

7474
def test_update_user_callable_attributes(self):
7575
user = User.objects.create(username='john')
@@ -88,9 +88,9 @@ def test_update_user_callable_attributes(self):
8888
'sn': ('Doe', ),
8989
}
9090
backend.update_user(user, attributes, attribute_mapping)
91-
self.assertEquals(user.email, '[email protected]')
92-
self.assertEquals(user.first_name, 'John')
93-
self.assertEquals(user.last_name, 'Doe')
91+
self.assertEqual(user.email, '[email protected]')
92+
self.assertEqual(user.first_name, 'John')
93+
self.assertEqual(user.last_name, 'Doe')
9494

9595
def test_update_user_empty_attribute(self):
9696
user = User.objects.create(username='john', last_name='Smith')
@@ -109,40 +109,40 @@ def test_update_user_empty_attribute(self):
109109
'sn': (),
110110
}
111111
backend.update_user(user, attributes, attribute_mapping)
112-
self.assertEquals(user.email, '[email protected]')
113-
self.assertEquals(user.first_name, 'John')
112+
self.assertEqual(user.email, '[email protected]')
113+
self.assertEqual(user.first_name, 'John')
114114
# empty attribute list: no update
115-
self.assertEquals(user.last_name, 'Smith')
115+
self.assertEqual(user.last_name, 'Smith')
116116

117117
def test_django_user_main_attribute(self):
118118
backend = Saml2Backend()
119119

120120
old_username_field = User.USERNAME_FIELD
121121
User.USERNAME_FIELD = 'slug'
122-
self.assertEquals(backend.get_django_user_main_attribute(), 'slug')
122+
self.assertEqual(backend.get_django_user_main_attribute(), 'slug')
123123
User.USERNAME_FIELD = old_username_field
124124

125125
with override_settings(AUTH_USER_MODEL='auth.User'):
126-
self.assertEquals(
126+
self.assertEqual(
127127
DjangoUserModel.USERNAME_FIELD,
128128
backend.get_django_user_main_attribute())
129129

130130
with override_settings(
131131
AUTH_USER_MODEL='testprofiles.StandaloneUserModel'):
132-
self.assertEquals(
132+
self.assertEqual(
133133
backend.get_django_user_main_attribute(),
134134
'username')
135135

136136
with override_settings(SAML_DJANGO_USER_MAIN_ATTRIBUTE='foo'):
137-
self.assertEquals(backend.get_django_user_main_attribute(), 'foo')
137+
self.assertEqual(backend.get_django_user_main_attribute(), 'foo')
138138

139139
def test_django_user_main_attribute_lookup(self):
140140
backend = Saml2Backend()
141141

142-
self.assertEquals(backend.get_django_user_main_attribute_lookup(), '')
142+
self.assertEqual(backend.get_django_user_main_attribute_lookup(), '')
143143

144144
with override_settings(
145145
SAML_DJANGO_USER_MAIN_ATTRIBUTE_LOOKUP='__iexact'):
146-
self.assertEquals(
146+
self.assertEqual(
147147
backend.get_django_user_main_attribute_lookup(),
148148
'__iexact')

0 commit comments

Comments
 (0)