Commit 4f336f66 authored by Jon Dufresne's avatar Jon Dufresne Committed by Tim Graham
Browse files

Fixed #26747 -- Used more specific assertions in the Django test suite.

parent ea34426a

docs/intro/tutorial05.txt

+5 −5
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ Put the following in the ``tests.py`` file in the ``polls`` application: 
            """

            time = timezone.now() + datetime.timedelta(days=30)

            future_question = Question(pub_date=time)

            self.assertEqual(future_question.was_published_recently(), False)

            self.assertIs(future_question.was_published_recently(), False)



What we have done here is created a :class:`django.test.TestCase` subclass

with a method that creates a ``Question`` instance with a ``pub_date`` in the
@@ -203,8 +203,8 @@ and you'll see something like:: 
    ----------------------------------------------------------------------

    Traceback (most recent call last):

      File "/path/to/mysite/polls/tests.py", line 16, in test_was_published_recently_with_future_question

        self.assertEqual(future_question.was_published_recently(), False)

    AssertionError: True != False

        self.assertIs(future_question.was_published_recently(), False)

    AssertionError: True is not False



    ----------------------------------------------------------------------

    Ran 1 test in 0.001s
@@ -285,7 +285,7 @@ more comprehensively: 
        """

        time = timezone.now() - datetime.timedelta(days=30)

        old_question = Question(pub_date=time)

        self.assertEqual(old_question.was_published_recently(), False)

        self.assertIs(old_question.was_published_recently(), False)



    def test_was_published_recently_with_recent_question(self):

        """
@@ -294,7 +294,7 @@ more comprehensively: 
        """

        time = timezone.now() - datetime.timedelta(hours=1)

        recent_question = Question(pub_date=time)

        self.assertEqual(recent_question.was_published_recently(), True)

        self.assertIs(recent_question.was_published_recently(), True)



And now we have three tests that confirm that ``Question.was_published_recently()``

returns sensible values for past, recent, and future questions.

docs/topics/testing/overview.txt

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ failed:: 
    ----------------------------------------------------------------------

    Traceback (most recent call last):

      File "/dev/mysite/polls/tests.py", line 16, in test_was_published_recently_with_future_poll

        self.assertEqual(future_poll.was_published_recently(), False)

    AssertionError: True != False

        self.assertIs(future_poll.was_published_recently(), False)

    AssertionError: True is not False



    ----------------------------------------------------------------------

    Ran 1 test in 0.003s

tests/admin_changelist/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class ChangeListTests(TestCase): 
            request, Child,

            *get_changelist_args(ia, list_select_related=ia.get_list_select_related(request))

        )

        self.assertEqual(cl.queryset.query.select_related, False)

        self.assertIs(cl.queryset.query.select_related, False)



    def test_get_select_related_custom_method(self):

        class GetListSelectRelatedAdmin(admin.ModelAdmin):

tests/admin_filters/tests.py

+39 −39
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][4]

        self.assertEqual(force_text(filterspec.title), 'date registered')

        choice = select_by(filterspec.choices(changelist), "display", "Today")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(

            choice['query_string'],

            '?date_registered__gte=%s&date_registered__lt=%s' % (
@@ -361,7 +361,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][4]

        self.assertEqual(force_text(filterspec.title), 'date registered')

        choice = select_by(filterspec.choices(changelist), "display", "This month")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(

            choice['query_string'],

            '?date_registered__gte=%s&date_registered__lt=%s' % (
@@ -386,7 +386,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][4]

        self.assertEqual(force_text(filterspec.title), 'date registered')

        choice = select_by(filterspec.choices(changelist), "display", "This year")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(

            choice['query_string'],

            '?date_registered__gte=%s&date_registered__lt=%s' % (
@@ -409,7 +409,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][4]

        self.assertEqual(force_text(filterspec.title), 'date registered')

        choice = select_by(filterspec.choices(changelist), "display", "Past 7 days")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(

            choice['query_string'],

            '?date_registered__gte=%s&date_registered__lt=%s' % (
@@ -431,7 +431,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][4]

        self.assertEqual(force_text(filterspec.title), 'date registered')

        choice = select_by(filterspec.choices(changelist), 'display', 'No date')

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?date_registered__isnull=True')



        request = self.request_factory.get('/', {'date_registered__isnull': 'False'})
@@ -446,7 +446,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][4]

        self.assertEqual(force_text(filterspec.title), 'date registered')

        choice = select_by(filterspec.choices(changelist), 'display', 'Has date')

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?date_registered__isnull=False')



    @unittest.skipIf(
@@ -473,7 +473,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][0]

        self.assertEqual(force_text(filterspec.title), 'year')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[-1]['selected'], True)

        self.assertIs(choices[-1]['selected'], True)

        self.assertEqual(choices[-1]['query_string'], '?year__isnull=True')



        request = self.request_factory.get('/', {'year': '2002'})
@@ -483,7 +483,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][0]

        self.assertEqual(force_text(filterspec.title), 'year')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[2]['selected'], True)

        self.assertIs(choices[2]['selected'], True)

        self.assertEqual(choices[2]['query_string'], '?year=2002')



    def test_allvaluesfieldlistfilter_custom_qs(self):
@@ -524,7 +524,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][1]

        self.assertEqual(force_text(filterspec.title), 'Verbose Author')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[-1]['selected'], True)

        self.assertIs(choices[-1]['selected'], True)

        self.assertEqual(choices[-1]['query_string'], '?author__isnull=True')



        request = self.request_factory.get('/', {'author__id__exact': self.alfred.pk})
@@ -535,7 +535,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'Verbose Author')

        # order of choices depends on User model, which has no order

        choice = select_by(filterspec.choices(changelist), "display", "alfred")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?author__id__exact=%d' % self.alfred.pk)



    def test_relatedfieldlistfilter_manytomany(self):
@@ -560,7 +560,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][2]

        self.assertEqual(force_text(filterspec.title), 'Verbose Contributors')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[-1]['selected'], True)

        self.assertIs(choices[-1]['selected'], True)

        self.assertEqual(choices[-1]['query_string'], '?contributors__isnull=True')



        request = self.request_factory.get('/', {'contributors__id__exact': self.bob.pk})
@@ -570,7 +570,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][2]

        self.assertEqual(force_text(filterspec.title), 'Verbose Contributors')

        choice = select_by(filterspec.choices(changelist), "display", "bob")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?contributors__id__exact=%d' % self.bob.pk)



    def test_relatedfieldlistfilter_reverse_relationships(self):
@@ -588,7 +588,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][0]

        self.assertEqual(force_text(filterspec.title), 'book')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[-1]['selected'], True)

        self.assertIs(choices[-1]['selected'], True)

        self.assertEqual(choices[-1]['query_string'], '?books_authored__isnull=True')



        request = self.request_factory.get('/', {'books_authored__id__exact': self.bio_book.pk})
@@ -598,7 +598,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][0]

        self.assertEqual(force_text(filterspec.title), 'book')

        choice = select_by(filterspec.choices(changelist), "display", self.bio_book.title)

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?books_authored__id__exact=%d' % self.bio_book.pk)



        # M2M relationship -----
@@ -613,7 +613,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][1]

        self.assertEqual(force_text(filterspec.title), 'book')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[-1]['selected'], True)

        self.assertIs(choices[-1]['selected'], True)

        self.assertEqual(choices[-1]['query_string'], '?books_contributed__isnull=True')



        request = self.request_factory.get('/', {'books_contributed__id__exact': self.django_book.pk})
@@ -623,7 +623,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][1]

        self.assertEqual(force_text(filterspec.title), 'book')

        choice = select_by(filterspec.choices(changelist), "display", self.django_book.title)

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?books_contributed__id__exact=%d' % self.django_book.pk)



        # With one book, the list filter should appear because there is also a
@@ -719,7 +719,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][3]

        self.assertEqual(force_text(filterspec.title), 'is best seller')

        choice = select_by(filterspec.choices(changelist), "display", "No")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?is_best_seller__exact=0')



        request = self.request_factory.get('/', {'is_best_seller__exact': 1})
@@ -733,7 +733,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][3]

        self.assertEqual(force_text(filterspec.title), 'is best seller')

        choice = select_by(filterspec.choices(changelist), "display", "Yes")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?is_best_seller__exact=1')



        request = self.request_factory.get('/', {'is_best_seller__isnull': 'True'})
@@ -747,7 +747,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][3]

        self.assertEqual(force_text(filterspec.title), 'is best seller')

        choice = select_by(filterspec.choices(changelist), "display", "Unknown")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?is_best_seller__isnull=True')



    def test_fieldlistfilter_underscorelookup_tuple(self):
@@ -782,7 +782,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[0]['display'], 'All')

        self.assertEqual(choices[0]['selected'], True)

        self.assertIs(choices[0]['selected'], True)

        self.assertEqual(choices[0]['query_string'], '?')



        # Look for books in the 1980s ----------------------------------------
@@ -798,7 +798,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[1]['display'], 'the 1980\'s')

        self.assertEqual(choices[1]['selected'], True)

        self.assertIs(choices[1]['selected'], True)

        self.assertEqual(choices[1]['query_string'], '?publication-decade=the+80s')



        # Look for books in the 1990s ----------------------------------------
@@ -814,7 +814,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[2]['display'], 'the 1990\'s')

        self.assertEqual(choices[2]['selected'], True)

        self.assertIs(choices[2]['selected'], True)

        self.assertEqual(choices[2]['query_string'], '?publication-decade=the+90s')



        # Look for books in the 2000s ----------------------------------------
@@ -830,7 +830,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[3]['display'], 'the 2000\'s')

        self.assertEqual(choices[3]['selected'], True)

        self.assertIs(choices[3]['selected'], True)

        self.assertEqual(choices[3]['query_string'], '?publication-decade=the+00s')



        # Combine multiple filters -------------------------------------------
@@ -846,7 +846,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[3]['display'], 'the 2000\'s')

        self.assertEqual(choices[3]['selected'], True)

        self.assertIs(choices[3]['selected'], True)

        self.assertEqual(

            choices[3]['query_string'],

            '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk
@@ -855,7 +855,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][0]

        self.assertEqual(force_text(filterspec.title), 'Verbose Author')

        choice = select_by(filterspec.choices(changelist), "display", "alfred")

        self.assertEqual(choice['selected'], True)

        self.assertIs(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)



    def test_listfilter_without_title(self):
@@ -910,15 +910,15 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(len(choices), 3)



        self.assertEqual(choices[0]['display'], 'All')

        self.assertEqual(choices[0]['selected'], True)

        self.assertIs(choices[0]['selected'], True)

        self.assertEqual(choices[0]['query_string'], '?')



        self.assertEqual(choices[1]['display'], 'the 1990\'s')

        self.assertEqual(choices[1]['selected'], False)

        self.assertIs(choices[1]['selected'], False)

        self.assertEqual(choices[1]['query_string'], '?publication-decade=the+90s')



        self.assertEqual(choices[2]['display'], 'the 2000\'s')

        self.assertEqual(choices[2]['selected'], False)

        self.assertIs(choices[2]['selected'], False)

        self.assertEqual(choices[2]['query_string'], '?publication-decade=the+00s')



    def test_two_characters_long_field(self):
@@ -936,7 +936,7 @@ class ListFiltersTests(TestCase): 
        filterspec = changelist.get_filters(request)[0][-1]

        self.assertEqual(force_text(filterspec.title), 'number')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[2]['selected'], True)

        self.assertIs(choices[2]['selected'], True)

        self.assertEqual(choices[2]['query_string'], '?no=207')



    def test_parameter_ends_with__in__or__isnull(self):
@@ -958,7 +958,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[2]['display'], 'the 1990\'s')

        self.assertEqual(choices[2]['selected'], True)

        self.assertIs(choices[2]['selected'], True)

        self.assertEqual(choices[2]['query_string'], '?decade__in=the+90s')



        # When it ends with '__isnull' ---------------------------------------
@@ -975,7 +975,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'publication decade')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[2]['display'], 'the 1990\'s')

        self.assertEqual(choices[2]['selected'], True)

        self.assertIs(choices[2]['selected'], True)

        self.assertEqual(choices[2]['query_string'], '?decade__isnull=the+90s')



    def test_lookup_with_non_string_value(self):
@@ -995,7 +995,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'department')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[1]['display'], 'DEV')

        self.assertEqual(choices[1]['selected'], True)

        self.assertIs(choices[1]['selected'], True)

        self.assertEqual(choices[1]['query_string'], '?department=%s' % self.john.department.pk)



    def test_lookup_with_non_string_value_underscored(self):
@@ -1015,7 +1015,7 @@ class ListFiltersTests(TestCase): 
        self.assertEqual(force_text(filterspec.title), 'department')

        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[1]['display'], 'DEV')

        self.assertEqual(choices[1]['selected'], True)

        self.assertIs(choices[1]['selected'], True)

        self.assertEqual(choices[1]['query_string'], '?department__whatever=%s' % self.john.department.pk)



    def test_fk_with_to_field(self):
@@ -1036,15 +1036,15 @@ class ListFiltersTests(TestCase): 
        choices = list(filterspec.choices(changelist))



        self.assertEqual(choices[0]['display'], 'All')

        self.assertEqual(choices[0]['selected'], True)

        self.assertIs(choices[0]['selected'], True)

        self.assertEqual(choices[0]['query_string'], '?')



        self.assertEqual(choices[1]['display'], 'Development')

        self.assertEqual(choices[1]['selected'], False)

        self.assertIs(choices[1]['selected'], False)

        self.assertEqual(choices[1]['query_string'], '?department__code__exact=DEV')



        self.assertEqual(choices[2]['display'], 'Design')

        self.assertEqual(choices[2]['selected'], False)

        self.assertIs(choices[2]['selected'], False)

        self.assertEqual(choices[2]['query_string'], '?department__code__exact=DSN')



        # Filter by Department=='Development' --------------------------------
@@ -1061,15 +1061,15 @@ class ListFiltersTests(TestCase): 
        choices = list(filterspec.choices(changelist))



        self.assertEqual(choices[0]['display'], 'All')

        self.assertEqual(choices[0]['selected'], False)

        self.assertIs(choices[0]['selected'], False)

        self.assertEqual(choices[0]['query_string'], '?')



        self.assertEqual(choices[1]['display'], 'Development')

        self.assertEqual(choices[1]['selected'], True)

        self.assertIs(choices[1]['selected'], True)

        self.assertEqual(choices[1]['query_string'], '?department__code__exact=DEV')



        self.assertEqual(choices[2]['display'], 'Design')

        self.assertEqual(choices[2]['selected'], False)

        self.assertIs(choices[2]['selected'], False)

        self.assertEqual(choices[2]['query_string'], '?department__code__exact=DSN')



    def test_lookup_with_dynamic_value(self):

tests/admin_views/test_adminsite.py

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class SiteEachContextTest(TestCase): 
        self.assertEqual(ctx['site_header'], 'Django administration')

        self.assertEqual(ctx['site_title'], 'Django site admin')

        self.assertEqual(ctx['site_url'], '/')

        self.assertEqual(ctx['has_permission'], True)

        self.assertIs(ctx['has_permission'], True)



    def test_each_context_site_url_with_script_name(self):

        request = RequestFactory().get(reverse('test_adminsite:index'), SCRIPT_NAME='/my-script-name/')
@@ -66,12 +66,12 @@ class SiteEachContextTest(TestCase): 
        self.assertEqual(user['object_name'], 'User')



        self.assertEqual(auth['app_url'], '/test_admin/admin/auth/')

        self.assertEqual(auth['has_module_perms'], True)

        self.assertIs(auth['has_module_perms'], True)



        self.assertIn('perms', user)

        self.assertEqual(user['perms']['add'], True)

        self.assertEqual(user['perms']['change'], True)

        self.assertEqual(user['perms']['delete'], True)

        self.assertIs(user['perms']['add'], True)

        self.assertIs(user['perms']['change'], True)

        self.assertIs(user['perms']['delete'], True)

        self.assertEqual(user['admin_url'], '/test_admin/admin/auth/user/')

        self.assertEqual(user['add_url'], '/test_admin/admin/auth/user/add/')

        self.assertEqual(user['name'], 'Users')