diff options
| author | Tim Graham <timograham@gmail.com> | 2017-03-17 07:51:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 07:51:48 -0400 |
| commit | 6b4f018b2b3478d2a4a441ed52d43f6268ac89f3 (patch) | |
| tree | 21a1573a6d8a1e7ee8554adc318174ffda0bf8bd /tests/admin_ordering/tests.py | |
| parent | e32265de1a68361ea078f49877ccb0f742508728 (diff) | |
Replaced type-specific assertions with assertEqual().
Python docs say, "it's usually not necessary to invoke these methods directly."
Diffstat (limited to 'tests/admin_ordering/tests.py')
| -rw-r--r-- | tests/admin_ordering/tests.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/admin_ordering/tests.py b/tests/admin_ordering/tests.py index 0398616d2e..74a6b8b24b 100644 --- a/tests/admin_ordering/tests.py +++ b/tests/admin_ordering/tests.py @@ -49,7 +49,7 @@ class TestAdminOrdering(TestCase): """ ma = ModelAdmin(Band, site) names = [b.name for b in ma.get_queryset(request)] - self.assertListEqual(['Aerosmith', 'Radiohead', 'Van Halen'], names) + self.assertEqual(['Aerosmith', 'Radiohead', 'Van Halen'], names) def test_specified_ordering(self): """ @@ -60,7 +60,7 @@ class TestAdminOrdering(TestCase): ordering = ('rank',) # default ordering is ('name',) ma = BandAdmin(Band, site) names = [b.name for b in ma.get_queryset(request)] - self.assertListEqual(['Radiohead', 'Van Halen', 'Aerosmith'], names) + self.assertEqual(['Radiohead', 'Van Halen', 'Aerosmith'], names) def test_dynamic_ordering(self): """ @@ -72,10 +72,10 @@ class TestAdminOrdering(TestCase): request.user = super_user ma = DynOrderingBandAdmin(Band, site) names = [b.name for b in ma.get_queryset(request)] - self.assertListEqual(['Radiohead', 'Van Halen', 'Aerosmith'], names) + self.assertEqual(['Radiohead', 'Van Halen', 'Aerosmith'], names) request.user = other_user names = [b.name for b in ma.get_queryset(request)] - self.assertListEqual(['Aerosmith', 'Radiohead', 'Van Halen'], names) + self.assertEqual(['Aerosmith', 'Radiohead', 'Van Halen'], names) class TestInlineModelAdminOrdering(TestCase): @@ -99,7 +99,7 @@ class TestInlineModelAdminOrdering(TestCase): """ inline = SongInlineDefaultOrdering(self.band, site) names = [s.name for s in inline.get_queryset(request)] - self.assertListEqual(['Dude (Looks Like a Lady)', 'Jaded', 'Pink'], names) + self.assertEqual(['Dude (Looks Like a Lady)', 'Jaded', 'Pink'], names) def test_specified_ordering(self): """ @@ -107,7 +107,7 @@ class TestInlineModelAdminOrdering(TestCase): """ inline = SongInlineNewOrdering(self.band, site) names = [s.name for s in inline.get_queryset(request)] - self.assertListEqual(['Jaded', 'Pink', 'Dude (Looks Like a Lady)'], names) + self.assertEqual(['Jaded', 'Pink', 'Dude (Looks Like a Lady)'], names) class TestRelatedFieldsAdminOrdering(TestCase): @@ -130,9 +130,8 @@ class TestRelatedFieldsAdminOrdering(TestCase): def check_ordering_of_field_choices(self, correct_ordering): fk_field = site._registry[Song].formfield_for_foreignkey(Song.band.field, request=None) m2m_field = site._registry[Song].formfield_for_manytomany(Song.other_interpreters.field, request=None) - - self.assertListEqual(list(fk_field.queryset), correct_ordering) - self.assertListEqual(list(m2m_field.queryset), correct_ordering) + self.assertEqual(list(fk_field.queryset), correct_ordering) + self.assertEqual(list(m2m_field.queryset), correct_ordering) def test_no_admin_fallback_to_model_ordering(self): # should be ordered by name (as defined by the model) |
