Commit cc48f66f authored by Alex Gaynor's avatar Alex Gaynor
Browse files

[1.2.X] Removed all usages of deprecated TestCase methods (self.fail*). This... 

[1.2.X] Removed all usages of deprecated TestCase methods (self.fail*).  This removed most of the Warnings emitted (with -Wall) during the test suite. Backport of [14803].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5a792ec4

django/test/testcases.py

+5 −5
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ class TransactionTestCase(unittest.TestCase): 


        if hasattr(response, 'redirect_chain'):

            # The request was a followed redirect

            self.failUnless(len(response.redirect_chain) > 0,

            self.assertTrue(len(response.redirect_chain) > 0,

                msg_prefix + "Response didn't redirect as expected: Response"

                " code was %d (expected %d)" %

                    (response.status_code, status_code))
@@ -427,7 +427,7 @@ class TransactionTestCase(unittest.TestCase): 
                if field:

                    if field in context[form].errors:

                        field_errors = context[form].errors[field]

                        self.failUnless(err in field_errors,

                        self.assertTrue(err in field_errors,

                            msg_prefix + "The field '%s' on form '%s' in"

                            " context %d does not contain the error '%s'"

                            " (actual errors: %s)" %
@@ -442,7 +442,7 @@ class TransactionTestCase(unittest.TestCase): 
                                      (form, i, field))

                else:

                    non_field_errors = context[form].non_field_errors()

                    self.failUnless(err in non_field_errors,

                    self.assertTrue(err in non_field_errors,

                        msg_prefix + "The form '%s' in context %d does not"

                        " contain the non-field error '%s'"

                        " (actual errors: %s)" %
@@ -462,7 +462,7 @@ class TransactionTestCase(unittest.TestCase): 
        template_names = [t.name for t in to_list(response.template)]

        if not template_names:

            self.fail(msg_prefix + "No templates used to render the response")

        self.failUnless(template_name in template_names,

        self.assertTrue(template_name in template_names,

            msg_prefix + "Template '%s' was not a template used to render"

            " the response. Actual template(s) used: %s" %

                (template_name, u', '.join(template_names)))
@@ -476,7 +476,7 @@ class TransactionTestCase(unittest.TestCase): 
            msg_prefix += ": "



        template_names = [t.name for t in to_list(response.template)]

        self.failIf(template_name in template_names,

        self.assertFalse(template_name in template_names,

            msg_prefix + "Template '%s' was used unexpectedly in rendering"

            " the response" % template_name)

tests/modeltests/model_formsets/tests.py

+5 −5
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ import datetime 
import re

from datetime import date

from decimal import Decimal



from django import forms

from django.db import models

from django.forms.models import _get_foreign_key

from django.forms.models import inlineformset_factory

from django.forms.models import modelformset_factory

from django.forms.models import modelformset_factory

from django.forms.models import (_get_foreign_key, inlineformset_factory,

    modelformset_factory, modelformset_factory)

from django.test import TestCase



from modeltests.model_formsets.models import (

    Author, BetterAuthor, Book, BookWithCustomPK, Editor,

    BookWithOptionalAltEditor, AlternateBook, AuthorMeeting, CustomPrimaryKey,
@@ -30,7 +30,7 @@ class DeletionTests(TestCase): 
        }

        formset = PoetFormSet(data, queryset=Poet.objects.all())

        formset.save()

        self.failUnless(formset.is_valid())

        self.assertTrue(formset.is_valid())

        self.assertEqual(Poet.objects.count(), 0)



    def test_add_form_deletion_when_invalid(self):

tests/modeltests/signals/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -143,6 +143,6 @@ class SignalTests(TestCase): 
        signals.post_save.connect(sender=Person, receiver=b)

        p = Person.objects.create(first_name='John', last_name='Smith')



        self.failUnless(a._run)

        self.failUnless(b._run)

        self.assertTrue(a._run)

        self.assertTrue(b._run)

        self.assertEqual(signals.post_save.receivers, [])

tests/modeltests/test_client/models.py

+8 −8
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class ClientTest(TestCase): 
        self.assertEqual(response.status_code, 200)

        self.assertEqual(response.context['data'], '37')

        self.assertEqual(response.template.name, 'POST Template')

        self.failUnless('Data received' in response.content)

        self.assertTrue('Data received' in response.content)



    def test_response_headers(self):

        "Check the value of HTTP headers returned in a response"
@@ -275,7 +275,7 @@ class ClientTest(TestCase): 


        # Log in

        login = self.client.login(username='testclient', password='password')

        self.failUnless(login, 'Could not log in')

        self.assertTrue(login, 'Could not log in')



        # Request a page that requires a login

        response = self.client.get('/test_client/login_protected_view/')
@@ -291,7 +291,7 @@ class ClientTest(TestCase): 


        # Log in

        login = self.client.login(username='testclient', password='password')

        self.failUnless(login, 'Could not log in')

        self.assertTrue(login, 'Could not log in')



        # Request a page that requires a login

        response = self.client.get('/test_client/login_protected_method_view/')
@@ -307,7 +307,7 @@ class ClientTest(TestCase): 


        # Log in

        login = self.client.login(username='testclient', password='password')

        self.failUnless(login, 'Could not log in')

        self.assertTrue(login, 'Could not log in')



        # Request a page that requires a login

        response = self.client.get('/test_client/login_protected_view_custom_redirect/')
@@ -318,13 +318,13 @@ class ClientTest(TestCase): 
        "Request a page that is protected with @login, but use bad credentials"



        login = self.client.login(username='otheruser', password='nopassword')

        self.failIf(login)

        self.assertFalse(login)



    def test_view_with_inactive_login(self):

        "Request a page that is protected with @login, but use an inactive login"



        login = self.client.login(username='inactive', password='password')

        self.failIf(login)

        self.assertFalse(login)



    def test_logout(self):

        "Request a logout after logging in"
@@ -352,7 +352,7 @@ class ClientTest(TestCase): 


        # Log in

        login = self.client.login(username='testclient', password='password')

        self.failUnless(login, 'Could not log in')

        self.assertTrue(login, 'Could not log in')



        # Log in with wrong permissions. Should result in 302.

        response = self.client.get('/test_client/permission_protected_view/')
@@ -369,7 +369,7 @@ class ClientTest(TestCase): 


        # Log in

        login = self.client.login(username='testclient', password='password')

        self.failUnless(login, 'Could not log in')

        self.assertTrue(login, 'Could not log in')



        # Log in with wrong permissions. Should result in 302.

        response = self.client.get('/test_client/permission_protected_method_view/')

tests/modeltests/update/tests.py

+10 −9
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ from django.test import TestCase 


from models import A, B, C, D, DataPoint, RelatedPoint





class SimpleTest(TestCase):

    def setUp(self):

        self.a1 = A.objects.create()
@@ -15,18 +16,18 @@ class SimpleTest(TestCase): 
        Test that update changes the right number of rows for a nonempty queryset

        """

        num_updated = self.a1.b_set.update(y=100)

        self.failUnlessEqual(num_updated, 20)

        self.assertEqual(num_updated, 20)

        cnt = B.objects.filter(y=100).count()

        self.failUnlessEqual(cnt, 20)

        self.assertEqual(cnt, 20)



    def test_empty_update(self):

        """

        Test that update changes the right number of rows for an empty queryset

        """

        num_updated = self.a2.b_set.update(y=100)

        self.failUnlessEqual(num_updated, 0)

        self.assertEqual(num_updated, 0)

        cnt = B.objects.filter(y=100).count()

        self.failUnlessEqual(cnt, 0)

        self.assertEqual(cnt, 0)



    def test_nonempty_update_with_inheritance(self):

        """
@@ -34,9 +35,9 @@ class SimpleTest(TestCase): 
        when the update affects only a base table

        """

        num_updated = self.a1.d_set.update(y=100)

        self.failUnlessEqual(num_updated, 20)

        self.assertEqual(num_updated, 20)

        cnt = D.objects.filter(y=100).count()

        self.failUnlessEqual(cnt, 20)

        self.assertEqual(cnt, 20)



    def test_empty_update_with_inheritance(self):

        """
@@ -44,9 +45,9 @@ class SimpleTest(TestCase): 
        when the update affects only a base table

        """

        num_updated = self.a2.d_set.update(y=100)

        self.failUnlessEqual(num_updated, 0)

        self.assertEqual(num_updated, 0)

        cnt = D.objects.filter(y=100).count()

        self.failUnlessEqual(cnt, 0)

        self.assertEqual(cnt, 0)



class AdvancedTests(TestCase):