Commit afd040d4 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 

 assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b7c41c1f

django/contrib/auth/tests/basic.py

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class BasicTestCase(TestCase): 
        command_output = new_io.getvalue().strip()

        self.assertEqual(command_output, 'Superuser created successfully.')

        u = User.objects.get(username="joe")

        self.assertEquals(u.email, 'joe@somewhere.org')

        self.assertEqual(u.email, 'joe@somewhere.org')



        # created password should be unusable

        self.assertFalse(u.has_usable_password())
@@ -78,7 +78,7 @@ class BasicTestCase(TestCase): 
        command_output = new_io.getvalue().strip()

        self.assertEqual(command_output, '')

        u = User.objects.get(username="joe2")

        self.assertEquals(u.email, 'joe2@somewhere.org')

        self.assertEqual(u.email, 'joe2@somewhere.org')

        self.assertFalse(u.has_usable_password())
@@ -90,6 +90,6 @@ class BasicTestCase(TestCase): 
            stdout=new_io

        )

        u = User.objects.get(username="joe+admin@somewhere.org")

        self.assertEquals(u.email, 'joe@somewhere.org')

        self.assertEqual(u.email, 'joe@somewhere.org')

        self.assertFalse(u.has_usable_password())

django/contrib/auth/tests/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class LoginRequiredTestCase(AuthViewsTestCase): 
        """

        response = self.client.get(view_url)

        self.assertEqual(response.status_code, 302)

        self.assert_(login_url in response['Location'])

        self.assertTrue(login_url in response['Location'])

        self.login()

        response = self.client.get(view_url)

        self.assertEqual(response.status_code, 200)

django/contrib/auth/tests/remote_user.py

+4 −4
Original line number Diff line number Diff line
@@ -30,15 +30,15 @@ class RemoteUserTest(TestCase): 
        num_users = User.objects.count()



        response = self.client.get('/remote_user/')

        self.assert_(response.context['user'].is_anonymous())

        self.assertTrue(response.context['user'].is_anonymous())

        self.assertEqual(User.objects.count(), num_users)



        response = self.client.get('/remote_user/', REMOTE_USER=None)

        self.assert_(response.context['user'].is_anonymous())

        self.assertTrue(response.context['user'].is_anonymous())

        self.assertEqual(User.objects.count(), num_users)



        response = self.client.get('/remote_user/', REMOTE_USER='')

        self.assert_(response.context['user'].is_anonymous())

        self.assertTrue(response.context['user'].is_anonymous())

        self.assertEqual(User.objects.count(), num_users)



    def test_unknown_user(self):
@@ -115,7 +115,7 @@ class RemoteUserNoCreateTest(RemoteUserTest): 
    def test_unknown_user(self):

        num_users = User.objects.count()

        response = self.client.get('/remote_user/', REMOTE_USER='newuser')

        self.assert_(response.context['user'].is_anonymous())

        self.assertTrue(response.context['user'].is_anonymous())

        self.assertEqual(User.objects.count(), num_users)

django/contrib/auth/tests/views.py

+57 −57
Original line number Diff line number Diff line
@@ -40,53 +40,53 @@ class AuthViewsTestCase(TestCase): 
            'password': password

            }

        )

        self.assertEquals(response.status_code, 302)

        self.assert_(response['Location'].endswith(settings.LOGIN_REDIRECT_URL))

        self.assert_(SESSION_KEY in self.client.session)

        self.assertEqual(response.status_code, 302)

        self.assertTrue(response['Location'].endswith(settings.LOGIN_REDIRECT_URL))

        self.assertTrue(SESSION_KEY in self.client.session)



class PasswordResetTest(AuthViewsTestCase):



    def test_email_not_found(self):

        "Error is raised if the provided email address isn't currently registered"

        response = self.client.get('/password_reset/')

        self.assertEquals(response.status_code, 200)

        self.assertEqual(response.status_code, 200)

        response = self.client.post('/password_reset/', {'email': 'not_a_real_email@email.com'})

        self.assertContains(response, "That e-mail address doesn't have an associated user account")

        self.assertEquals(len(mail.outbox), 0)

        self.assertEqual(len(mail.outbox), 0)



    def test_email_found(self):

        "Email is sent if a valid email address is provided for password reset"

        response = self.client.post('/password_reset/', {'email': 'staffmember@example.com'})

        self.assertEquals(response.status_code, 302)

        self.assertEquals(len(mail.outbox), 1)

        self.assert_("http://" in mail.outbox[0].body)

        self.assertEquals(settings.DEFAULT_FROM_EMAIL, mail.outbox[0].from_email)

        self.assertEqual(response.status_code, 302)

        self.assertEqual(len(mail.outbox), 1)

        self.assertTrue("http://" in mail.outbox[0].body)

        self.assertEqual(settings.DEFAULT_FROM_EMAIL, mail.outbox[0].from_email)



    def test_email_found_custom_from(self):

        "Email is sent if a valid email address is provided for password reset when a custom from_email is provided."

        response = self.client.post('/password_reset_from_email/', {'email': 'staffmember@example.com'})

        self.assertEquals(response.status_code, 302)

        self.assertEquals(len(mail.outbox), 1)

        self.assertEquals("staffmember@example.com", mail.outbox[0].from_email)

        self.assertEqual(response.status_code, 302)

        self.assertEqual(len(mail.outbox), 1)

        self.assertEqual("staffmember@example.com", mail.outbox[0].from_email)



    def _test_confirm_start(self):

        # Start by creating the email

        response = self.client.post('/password_reset/', {'email': 'staffmember@example.com'})

        self.assertEquals(response.status_code, 302)

        self.assertEquals(len(mail.outbox), 1)

        self.assertEqual(response.status_code, 302)

        self.assertEqual(len(mail.outbox), 1)

        return self._read_signup_email(mail.outbox[0])



    def _read_signup_email(self, email):

        urlmatch = re.search(r"https?://[^/]*(/.*reset/\S*)", email.body)

        self.assert_(urlmatch is not None, "No URL found in sent email")

        self.assertTrue(urlmatch is not None, "No URL found in sent email")

        return urlmatch.group(), urlmatch.groups()[0]



    def test_confirm_valid(self):

        url, path = self._test_confirm_start()

        response = self.client.get(path)

        # redirect to a 'complete' page:

        self.assertEquals(response.status_code, 200)

        self.assert_("Please enter your new password" in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("Please enter your new password" in response.content)



    def test_confirm_invalid(self):

        url, path = self._test_confirm_start()
@@ -95,20 +95,20 @@ class PasswordResetTest(AuthViewsTestCase): 
        path = path[:-5] + ("0"*4) + path[-1]



        response = self.client.get(path)

        self.assertEquals(response.status_code, 200)

        self.assert_("The password reset link was invalid" in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("The password reset link was invalid" in response.content)



    def test_confirm_invalid_user(self):

        # Ensure that we get a 200 response for a non-existant user, not a 404

        response = self.client.get('/reset/123456-1-1/')

        self.assertEquals(response.status_code, 200)

        self.assert_("The password reset link was invalid" in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("The password reset link was invalid" in response.content)



    def test_confirm_overflow_user(self):

        # Ensure that we get a 200 response for a base36 user id that overflows int

        response = self.client.get('/reset/zzzzzzzzzzzzz-1-1/')

        self.assertEquals(response.status_code, 200)

        self.assert_("The password reset link was invalid" in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("The password reset link was invalid" in response.content)



    def test_confirm_invalid_post(self):

        # Same as test_confirm_invalid, but trying
@@ -120,29 +120,29 @@ class PasswordResetTest(AuthViewsTestCase): 
                                           'new_password2':' anewpassword'})

        # Check the password has not been changed

        u = User.objects.get(email='staffmember@example.com')

        self.assert_(not u.check_password("anewpassword"))

        self.assertTrue(not u.check_password("anewpassword"))



    def test_confirm_complete(self):

        url, path = self._test_confirm_start()

        response = self.client.post(path, {'new_password1': 'anewpassword',

                                           'new_password2': 'anewpassword'})

        # It redirects us to a 'complete' page:

        self.assertEquals(response.status_code, 302)

        self.assertEqual(response.status_code, 302)

        # Check the password has been changed

        u = User.objects.get(email='staffmember@example.com')

        self.assert_(u.check_password("anewpassword"))

        self.assertTrue(u.check_password("anewpassword"))



        # Check we can't use the link again

        response = self.client.get(path)

        self.assertEquals(response.status_code, 200)

        self.assert_("The password reset link was invalid" in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("The password reset link was invalid" in response.content)



    def test_confirm_different_passwords(self):

        url, path = self._test_confirm_start()

        response = self.client.post(path, {'new_password1': 'anewpassword',

                                           'new_password2':' x'})

        self.assertEquals(response.status_code, 200)

        self.assert_("The two password fields didn't match" in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("The two password fields didn't match" in response.content)



class ChangePasswordTest(AuthViewsTestCase):
@@ -152,8 +152,8 @@ class ChangePasswordTest(AuthViewsTestCase): 
            'password': password

            }

        )

        self.assertEquals(response.status_code, 200)

        self.assert_("Please enter a correct username and password. Note that both fields are case-sensitive." in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("Please enter a correct username and password. Note that both fields are case-sensitive." in response.content)



    def logout(self):

        response = self.client.get('/logout/')
@@ -166,8 +166,8 @@ class ChangePasswordTest(AuthViewsTestCase): 
            'new_password2': 'password1',

            }

        )

        self.assertEquals(response.status_code, 200)

        self.assert_("Your old password was entered incorrectly. Please enter it again." in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("Your old password was entered incorrectly. Please enter it again." in response.content)



    def test_password_change_fails_with_mismatched_passwords(self):

        self.login()
@@ -177,8 +177,8 @@ class ChangePasswordTest(AuthViewsTestCase): 
            'new_password2': 'donuts',

            }

        )

        self.assertEquals(response.status_code, 200)

        self.assert_("The two password fields didn't match." in response.content)

        self.assertEqual(response.status_code, 200)

        self.assertTrue("The two password fields didn't match." in response.content)



    def test_password_change_succeeds(self):

        self.login()
@@ -188,8 +188,8 @@ class ChangePasswordTest(AuthViewsTestCase): 
            'new_password2': 'password1',

            }

        )

        self.assertEquals(response.status_code, 302)

        self.assert_(response['Location'].endswith('/password_change/done/'))

        self.assertEqual(response.status_code, 302)

        self.assertTrue(response['Location'].endswith('/password_change/done/'))

        self.fail_login()

        self.login(password='password1')
@@ -197,14 +197,14 @@ class LoginTest(AuthViewsTestCase): 


    def test_current_site_in_context_after_login(self):

        response = self.client.get(reverse('django.contrib.auth.views.login'))

        self.assertEquals(response.status_code, 200)

        self.assertEqual(response.status_code, 200)

        if Site._meta.installed:

            site = Site.objects.get_current()

            self.assertEquals(response.context['site'], site)

            self.assertEquals(response.context['site_name'], site.name)

            self.assertEqual(response.context['site'], site)

            self.assertEqual(response.context['site_name'], site.name)

        else:

            self.assertIsInstance(response.context['site'], RequestSite)

        self.assert_(isinstance(response.context['form'], AuthenticationForm), 

        self.assertTrue(isinstance(response.context['form'], AuthenticationForm),

                     'Login form is not an AuthenticationForm')



    def test_security_check(self, password='password'):
@@ -226,7 +226,7 @@ class LoginTest(AuthViewsTestCase): 
                'password': password,

                }

            )

            self.assertEquals(response.status_code, 302)

            self.assertEqual(response.status_code, 302)

            self.assertFalse(bad_url in response['Location'],

                             "%s should be blocked" % bad_url)
@@ -249,7 +249,7 @@ class LoginTest(AuthViewsTestCase): 
                    'password': password,

                }

            )

            self.assertEquals(response.status_code, 302)

            self.assertEqual(response.status_code, 302)

            self.assertTrue(good_url in response['Location'],

                            "%s should be allowed" % good_url)
@@ -268,7 +268,7 @@ class LoginURLSettings(AuthViewsTestCase): 
    def get_login_required_url(self, login_url):

        settings.LOGIN_URL = login_url

        response = self.client.get('/login_required/')

        self.assertEquals(response.status_code, 302)

        self.assertEqual(response.status_code, 302)

        return response['Location']



    def test_standard_login_url(self):
@@ -317,14 +317,14 @@ class LogoutTest(AuthViewsTestCase): 
    urls = 'django.contrib.auth.tests.urls'



    def confirm_logged_out(self):

        self.assert_(SESSION_KEY not in self.client.session)

        self.assertTrue(SESSION_KEY not in self.client.session)



    def test_logout_default(self):

        "Logout without next_page option renders the default template"

        self.login()

        response = self.client.get('/logout/')

        self.assertEquals(200, response.status_code)

        self.assert_('Logged out' in response.content)

        self.assertEqual(200, response.status_code)

        self.assertTrue('Logged out' in response.content)

        self.confirm_logged_out()



    def test_14377(self):
@@ -338,11 +338,11 @@ class LogoutTest(AuthViewsTestCase): 
        self.login()

        response = self.client.get('/logout/next_page/')

        self.assertEqual(response.status_code, 302)

        self.assert_(response['Location'].endswith('/somewhere/'))

        self.assertTrue(response['Location'].endswith('/somewhere/'))



        response = self.client.get('/logout/next_page/?next=/login/')

        self.assertEqual(response.status_code, 302)

        self.assert_(response['Location'].endswith('/login/'))

        self.assertTrue(response['Location'].endswith('/login/'))



        self.confirm_logged_out()
@@ -351,7 +351,7 @@ class LogoutTest(AuthViewsTestCase): 
        self.login()

        response = self.client.get('/logout/next_page/')

        self.assertEqual(response.status_code, 302)

        self.assert_(response['Location'].endswith('/somewhere/'))

        self.assertTrue(response['Location'].endswith('/somewhere/'))

        self.confirm_logged_out()



    def test_logout_with_redirect_argument(self):
@@ -359,7 +359,7 @@ class LogoutTest(AuthViewsTestCase): 
        self.login()

        response = self.client.get('/logout/?next=/login/')

        self.assertEqual(response.status_code, 302)

        self.assert_(response['Location'].endswith('/login/'))

        self.assertTrue(response['Location'].endswith('/login/'))

        self.confirm_logged_out()



    def test_logout_with_custom_redirect_argument(self):
@@ -367,7 +367,7 @@ class LogoutTest(AuthViewsTestCase): 
        self.login()

        response = self.client.get('/logout/custom_query/?follow=/somewhere/')

        self.assertEqual(response.status_code, 302)

        self.assert_(response['Location'].endswith('/somewhere/'))

        self.assertTrue(response['Location'].endswith('/somewhere/'))

        self.confirm_logged_out()



    def test_security_check(self, password='password'):
@@ -386,7 +386,7 @@ class LogoutTest(AuthViewsTestCase): 
            }

            self.login()

            response = self.client.get(nasty_url)

            self.assertEquals(response.status_code, 302)

            self.assertEqual(response.status_code, 302)

            self.assertFalse(bad_url in response['Location'],

                             "%s should be blocked" % bad_url)

            self.confirm_logged_out()
@@ -407,7 +407,7 @@ class LogoutTest(AuthViewsTestCase): 
            }

            self.login()

            response = self.client.get(safe_url)

            self.assertEquals(response.status_code, 302)

            self.assertEqual(response.status_code, 302)

            self.assertTrue(good_url in response['Location'],

                            "%s should be allowed" % good_url)

            self.confirm_logged_out()

django/contrib/flatpages/tests/csrf.py

+8 −8
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ class FlatpageCSRFTests(TestCase): 
    def test_view_flatpage(self):

        "A flatpage can be served through a view, even when the middleware is in use"

        response = self.client.get('/flatpage_root/flatpage/')

        self.assertEquals(response.status_code, 200)

        self.assertEqual(response.status_code, 200)

        self.assertContains(response, "<p>Isn't it flat!</p>")



    def test_view_non_existent_flatpage(self):

        "A non-existent flatpage raises 404 when served through a view, even when the middleware is in use"

        response = self.client.get('/flatpage_root/no_such_flatpage/')

        self.assertEquals(response.status_code, 404)

        self.assertEqual(response.status_code, 404)



    def test_view_authenticated_flatpage(self):

        "A flatpage served through a view can require authentication"
@@ -49,31 +49,31 @@ class FlatpageCSRFTests(TestCase): 
        User.objects.create_user('testuser', 'test@example.com', 's3krit')

        self.client.login(username='testuser',password='s3krit')

        response = self.client.get('/flatpage_root/sekrit/')

        self.assertEquals(response.status_code, 200)

        self.assertEqual(response.status_code, 200)

        self.assertContains(response, "<p>Isn't it sekrit!</p>")



    def test_fallback_flatpage(self):

        "A flatpage can be served by the fallback middlware"

        response = self.client.get('/flatpage/')

        self.assertEquals(response.status_code, 200)

        self.assertEqual(response.status_code, 200)

        self.assertContains(response, "<p>Isn't it flat!</p>")



    def test_fallback_non_existent_flatpage(self):

        "A non-existent flatpage raises a 404 when served by the fallback middlware"

        response = self.client.get('/no_such_flatpage/')

        self.assertEquals(response.status_code, 404)

        self.assertEqual(response.status_code, 404)



    def test_post_view_flatpage(self):

        "POSTing to a flatpage served through a view will raise a CSRF error if no token is provided (Refs #14156)"

        response = self.client.post('/flatpage_root/flatpage/')

        self.assertEquals(response.status_code, 403)

        self.assertEqual(response.status_code, 403)



    def test_post_fallback_flatpage(self):

        "POSTing to a flatpage served by the middleware will raise a CSRF error if no token is provided (Refs #14156)"

        response = self.client.post('/flatpage/')

        self.assertEquals(response.status_code, 403)

        self.assertEqual(response.status_code, 403)



    def test_post_unknown_page(self):

        "POSTing to an unknown page isn't caught as a 403 CSRF error"

        response = self.client.post('/no_such_page/')

        self.assertEquals(response.status_code, 404)
 
        self.assertEqual(response.status_code, 404)