Skip to content

Commit 02e628e

Browse files
geophphriegeophphrie
committed
Updated assertEqual naming convention
1 parent bb06f9b commit 02e628e

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

‎entity_emailer/tests/interface_tests.py

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@
2626
class ExtractEmailSubjectFromHtmlContentTest(SimpleTestCase):
2727
def test_blank(self):
2828
subject = extract_email_subject_from_html_content('')
29-
self.assertEquals(subject, '')
29+
self.assertEqual(subject, '')
3030

3131
def test_with_title_block(self):
3232
subject = extract_email_subject_from_html_content('<html><head><title> Hello! </title></head></html>')
33-
self.assertEquals(subject, 'Hello!')
33+
self.assertEqual(subject, 'Hello!')
3434

3535
def test_wo_title_block_under_40_chars_content(self):
3636
subject = extract_email_subject_from_html_content(' Small content ')
37-
self.assertEquals(subject, 'Small content')
37+
self.assertEqual(subject, 'Small content')
3838

3939
def test_wo_title_block_under_40_chars_multiline_content(self):
4040
subject = extract_email_subject_from_html_content((
4141
' Small content \n'
4242
'that spans multiple lines'
4343
))
44-
self.assertEquals(subject, 'Small content')
44+
self.assertEqual(subject, 'Small content')
4545

4646
def test_wo_title_block_gt_40_chars_content(self):
4747
subject = extract_email_subject_from_html_content((
4848
' This is reallly long content that is greater than 40 chars on the first line. It should have ...'
4949
))
50-
self.assertEquals(subject, 'This is reallly long content that is gre...')
50+
self.assertEqual(subject, 'This is reallly long content that is gre...')
5151

5252

5353
class ConvertEventsToEmailsTest(TestCase):
@@ -113,10 +113,10 @@ def test_basic_only_following_false_subscription(self):
113113
EntityEmailerInterface.convert_events_to_emails()
114114

115115
email = Email.objects.get()
116-
self.assertEquals(list(email.recipients.all()), [e])
117-
self.assertEquals(email.event.context, email_context)
118-
self.assertEquals(email.subject, '')
119-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
116+
self.assertEqual(list(email.recipients.all()), [e])
117+
self.assertEqual(email.event.context, email_context)
118+
self.assertEqual(email.subject, '')
119+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
120120

121121
@freeze_time('2013-1-2')
122122
def test_basic_only_following_false_subscription_marked_seen(self):
@@ -134,10 +134,10 @@ def test_basic_only_following_false_subscription_marked_seen(self):
134134
EntityEmailerInterface.convert_events_to_emails()
135135

136136
email = Email.objects.get()
137-
self.assertEquals(list(email.recipients.all()), [e])
138-
self.assertEquals(email.event.context, email_context)
139-
self.assertEquals(email.subject, '')
140-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
137+
self.assertEqual(list(email.recipients.all()), [e])
138+
self.assertEqual(email.event.context, email_context)
139+
self.assertEqual(email.subject, '')
140+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
141141

142142
@freeze_time('2013-1-2')
143143
def test_basic_only_following_true_subscription(self):
@@ -160,10 +160,10 @@ def test_basic_only_following_true_subscription(self):
160160

161161
email = Email.objects.get()
162162
# Since the other_e entity does not follow the se entity, only the e entity receives an email
163-
self.assertEquals(set(email.recipients.all()), set([e]))
164-
self.assertEquals(email.event.context, email_context)
165-
self.assertEquals(email.subject, '')
166-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
163+
self.assertEqual(set(email.recipients.all()), set([e]))
164+
self.assertEqual(email.event.context, email_context)
165+
self.assertEqual(email.subject, '')
166+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
167167

168168
@freeze_time('2013-1-2')
169169
def test_super_entity_only_following_false_subscription(self):
@@ -187,10 +187,10 @@ def test_super_entity_only_following_false_subscription(self):
187187
EntityEmailerInterface.convert_events_to_emails()
188188

189189
email = Email.objects.get()
190-
self.assertEquals(set(email.recipients.all()), set([e, other_e]))
191-
self.assertEquals(email.event.context, email_context)
192-
self.assertEquals(email.subject, '')
193-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
190+
self.assertEqual(set(email.recipients.all()), set([e, other_e]))
191+
self.assertEqual(email.event.context, email_context)
192+
self.assertEqual(email.subject, '')
193+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
194194

195195
@freeze_time('2013-1-2')
196196
def test_basic_only_following_true_group_subscription(self):
@@ -214,10 +214,10 @@ def test_basic_only_following_true_group_subscription(self):
214214

215215
email = Email.objects.get()
216216
# Both entities are subscribed with a group subscription and are following the super entity of the event
217-
self.assertEquals(set(email.recipients.all()), set([e, other_e]))
218-
self.assertEquals(email.event.context, email_context)
219-
self.assertEquals(email.subject, '')
220-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
217+
self.assertEqual(set(email.recipients.all()), set([e, other_e]))
218+
self.assertEqual(email.event.context, email_context)
219+
self.assertEqual(email.subject, '')
220+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
221221

222222
@freeze_time('2013-1-2')
223223
def test_basic_only_following_false_group_subscription(self):
@@ -241,10 +241,10 @@ def test_basic_only_following_false_group_subscription(self):
241241

242242
email = Email.objects.get()
243243
# Both entities are subscribed with a group subscription and are following the super entity of the event
244-
self.assertEquals(set(email.recipients.all()), set([e, other_e]))
245-
self.assertEquals(email.event.context, email_context)
246-
self.assertEquals(email.subject, '')
247-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
244+
self.assertEqual(set(email.recipients.all()), set([e, other_e]))
245+
self.assertEqual(email.event.context, email_context)
246+
self.assertEqual(email.subject, '')
247+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
248248

249249
@freeze_time('2013-1-2')
250250
def test_basic_only_following_false_group_subscription_with_unsubscribed(self):
@@ -268,10 +268,10 @@ def test_basic_only_following_false_group_subscription_with_unsubscribed(self):
268268
EntityEmailerInterface.convert_events_to_emails()
269269

270270
email = Email.objects.get()
271-
self.assertEquals(set(email.recipients.all()), set([other_e]))
272-
self.assertEquals(email.event.context, email_context)
273-
self.assertEquals(email.subject, '')
274-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
271+
self.assertEqual(set(email.recipients.all()), set([other_e]))
272+
self.assertEqual(email.event.context, email_context)
273+
self.assertEqual(email.subject, '')
274+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
275275

276276
@freeze_time('2013-1-2')
277277
def test_multiple_events_only_following_false(self):
@@ -290,12 +290,12 @@ def test_multiple_events_only_following_false(self):
290290

291291
EntityEmailerInterface.convert_events_to_emails()
292292

293-
self.assertEquals(Email.objects.count(), 2)
293+
self.assertEqual(Email.objects.count(), 2)
294294
for email in Email.objects.all():
295-
self.assertEquals(set(email.recipients.all()), set([e, other_e]))
296-
self.assertEquals(email.event.context, email_context)
297-
self.assertEquals(email.subject, '')
298-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
295+
self.assertEqual(set(email.recipients.all()), set([e, other_e]))
296+
self.assertEqual(email.event.context, email_context)
297+
self.assertEqual(email.subject, '')
298+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
299299

300300
@freeze_time('2013-1-2')
301301
def test_bulk_multiple_events_only_following_false(self):
@@ -319,12 +319,12 @@ def test_bulk_multiple_events_only_following_false(self):
319319

320320
EntityEmailerInterface.bulk_convert_events_to_emails()
321321

322-
self.assertEquals(Email.objects.count(), 2)
322+
self.assertEqual(Email.objects.count(), 2)
323323
for email in Email.objects.all():
324-
self.assertEquals(set(email.recipients.all()), set([e, other_e]))
325-
self.assertEquals(email.event.context, email_context)
326-
self.assertEquals(email.subject, '')
327-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
324+
self.assertEqual(set(email.recipients.all()), set([e, other_e]))
325+
self.assertEqual(email.event.context, email_context)
326+
self.assertEqual(email.subject, '')
327+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
328328

329329
@freeze_time('2013-1-2')
330330
def test_bulk_multiple_events_only_following_true(self):
@@ -350,10 +350,10 @@ def test_bulk_multiple_events_only_following_true(self):
350350
EntityEmailerInterface.bulk_convert_events_to_emails()
351351

352352
email = Email.objects.get()
353-
self.assertEquals(set(email.recipients.all()), set([e]))
354-
self.assertEquals(email.event.context, email_context)
355-
self.assertEquals(email.subject, '')
356-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
353+
self.assertEqual(set(email.recipients.all()), set([e]))
354+
self.assertEqual(email.event.context, email_context)
355+
self.assertEqual(email.subject, '')
356+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
357357

358358
@freeze_time('2013-1-2')
359359
def test_multiple_events_only_following_true(self):
@@ -374,10 +374,10 @@ def test_multiple_events_only_following_true(self):
374374
EntityEmailerInterface.convert_events_to_emails()
375375

376376
email = Email.objects.get()
377-
self.assertEquals(set(email.recipients.all()), set([e]))
378-
self.assertEquals(email.event.context, email_context)
379-
self.assertEquals(email.subject, '')
380-
self.assertEquals(email.scheduled, datetime(2013, 1, 2))
377+
self.assertEqual(set(email.recipients.all()), set([e]))
378+
self.assertEqual(email.event.context, email_context)
379+
self.assertEqual(email.subject, '')
380+
self.assertEqual(email.scheduled, datetime(2013, 1, 2))
381381

382382

383383
@freeze_time('2014-01-05')
@@ -531,7 +531,7 @@ def test_exceptions(self, render_mock, address_mock, mock_email_exception):
531531
self.assertEqual(Email.objects.filter(sent__isnull=False).count(), 1)
532532

533533
# Assert that only one email is actually sent through backend
534-
self.assertEquals(1, mock_connection.call_count)
534+
self.assertEqual(1, mock_connection.call_count)
535535
# Assert that one email raised an exception and that the tries count was updated
536536
exception_email = Email.objects.get(exception__isnull=False, num_tries=1)
537537
self.assertIsNotNone(exception_email)
@@ -558,7 +558,7 @@ def test_send_exceptions_and_retry(self, mock_get_subscribed_addresses, mock_ren
558558
mock_render.return_value = ('foo', 'bar',)
559559

560560
# Verify baseline, namely that both emails are not marked as sent and that neither has an exception saved
561-
self.assertEquals(2, Email.objects.filter(sent__isnull=True).count())
561+
self.assertEqual(2, Email.objects.filter(sent__isnull=True).count())
562562

563563
class TestEmailSendMessageException(Exception):
564564
@property
@@ -575,11 +575,11 @@ def to_dict(self):
575575
EntityEmailerInterface.send_unsent_scheduled_emails()
576576

577577
# Verify that only one email is marked as sent
578-
self.assertEquals(1, Email.objects.filter(sent__isnull=False).count())
578+
self.assertEqual(1, Email.objects.filter(sent__isnull=False).count())
579579
# Verify that the failed email was saved with the exception
580580
actual_failed_email = Email.objects.get(exception__isnull=False, num_tries=1)
581-
self.assertEquals(failed_email.id, actual_failed_email.id)
582-
self.assertEquals(
581+
self.assertEqual(failed_email.id, actual_failed_email.id)
582+
self.assertEqual(
583583
'test: {}'.format(json.dumps({'message': 'test'})),
584584
actual_failed_email.exception
585585
)
@@ -594,23 +594,23 @@ def to_dict(self):
594594
EntityEmailerInterface.send_unsent_scheduled_emails()
595595

596596
# Verify only called once, with the failed email
597-
self.assertEquals(1, mock_connection.return_value.__enter__.return_value.send_messages.call_count)
597+
self.assertEqual(1, mock_connection.return_value.__enter__.return_value.send_messages.call_count)
598598

599599
# Verify num tries updated
600600
actual_failed_email = Email.objects.get(exception__isnull=False, num_tries=2)
601-
self.assertEquals(failed_email.id, actual_failed_email.id)
601+
self.assertEqual(failed_email.id, actual_failed_email.id)
602602

603603
# Verify that a subsequent attempt to send unscheduled emails will find no emails to send
604604
with patch(settings.EMAIL_BACKEND) as mock_connection:
605605

606606
EntityEmailerInterface.send_unsent_scheduled_emails()
607607

608608
# Verify only called once, with the failed email
609-
self.assertEquals(0, mock_connection.return_value.__enter__.return_value.send_messages.call_count)
609+
self.assertEqual(0, mock_connection.return_value.__enter__.return_value.send_messages.call_count)
610610

611611
# Verify num tries not updated
612612
actual_failed_email = Email.objects.get(exception__isnull=False, num_tries=2)
613-
self.assertEquals(failed_email.id, actual_failed_email.id)
613+
self.assertEqual(failed_email.id, actual_failed_email.id)
614614

615615
@override_settings(DISABLE_DURABILITY_CHECKING=True, ENTITY_EMAILER_MAX_SEND_MESSAGE_TRIES=2)
616616
@patch.object(Event, 'render', spec_set=True)
@@ -627,7 +627,7 @@ def test_send_exception_with_to_dict_method(self, mock_get_subscribed_addresses,
627627
mock_render.return_value = ('foo', 'bar',)
628628

629629
# Verify baseline, namely that both emails are not marked as sent and that neither has an exception saved
630-
self.assertEquals(2, Email.objects.filter(sent__isnull=True).count())
630+
self.assertEqual(2, Email.objects.filter(sent__isnull=True).count())
631631

632632
class TestEmailSendMessageException(Exception):
633633
def to_dict(self):
@@ -643,11 +643,11 @@ def to_dict(self):
643643
EntityEmailerInterface.send_unsent_scheduled_emails()
644644

645645
# Verify that only one email is marked as sent
646-
self.assertEquals(1, Email.objects.filter(sent__isnull=False).count())
646+
self.assertEqual(1, Email.objects.filter(sent__isnull=False).count())
647647
# Verify that the failed email was saved with the exception
648648
actual_failed_email = Email.objects.get(exception__isnull=False, num_tries=1)
649-
self.assertEquals(failed_email.id, actual_failed_email.id)
650-
self.assertEquals(
649+
self.assertEqual(failed_email.id, actual_failed_email.id)
650+
self.assertEqual(
651651
'test: {}'.format(json.dumps({'message': 'test'})),
652652
actual_failed_email.exception
653653
)

0 commit comments

Comments
 (0)