Commit 34ee7d98 authored by Claude Paroz's avatar Claude Paroz
Browse files

Updated deprecated test assertions

parent 23ca3a01

django/contrib/auth/tests/management.py

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ class PermissionDuplicationTestCase(TestCase): 
        # check duplicated default permission

        models.Permission._meta.permissions = [

           ('change_permission', 'Can edit permission (duplicate)')]

        self.assertRaisesRegexp(CommandError,

        six.assertRaisesRegex(self, CommandError,

            "The permission codename 'change_permission' clashes with a "

            "builtin permission for model 'auth.Permission'.",

            create_permissions, models, [], verbosity=0)
@@ -197,7 +197,7 @@ class PermissionDuplicationTestCase(TestCase): 
            ('other_one', 'Some other permission'),

            ('my_custom_permission', 'Some permission with duplicate permission code'),

        ]

        self.assertRaisesRegexp(CommandError,

        six.assertRaisesRegex(self, CommandError,

            "The permission codename 'my_custom_permission' is duplicated for model "

            "'auth.Permission'.",

            create_permissions, models, [], verbosity=0)

tests/modeltests/basic/tests.py

+3 −3
Original line number Diff line number Diff line
@@ -141,21 +141,21 @@ class ModelTest(TestCase): 


        # Django raises an Article.MultipleObjectsReturned exception if the

        # lookup matches more than one object

        self.assertRaisesRegexp(

        six.assertRaisesRegex(self,

            MultipleObjectsReturned,

            "get\(\) returned more than one Article -- it returned 2!",

            Article.objects.get,

            headline__startswith='Area',

        )



        self.assertRaisesRegexp(

        six.assertRaisesRegex(self,

            MultipleObjectsReturned,

            "get\(\) returned more than one Article -- it returned 2!",

            Article.objects.get,

            pub_date__year=2005,

        )



        self.assertRaisesRegexp(

        six.assertRaisesRegex(self,

            MultipleObjectsReturned,

            "get\(\) returned more than one Article -- it returned 2!",

            Article.objects.get,

tests/modeltests/str/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class SimpleTests(TestCase): 
            headline='Girl wins €12.500 in lottery',

            pub_date=datetime.datetime(2005, 7, 28)

        )

        self.assertRaisesRegexp(RuntimeError, "Did you apply "

        six.assertRaisesRegex(self, RuntimeError, "Did you apply "

            "@python_2_unicode_compatible without defining __str__\?", str, a)



    def test_international(self):

tests/regressiontests/backends/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class OracleChecks(unittest.TestCase): 
        # Check that '%' chars are escaped for query execution.

        name = '"SOME%NAME"'

        quoted_name = connection.ops.quote_name(name)

        self.assertEquals(quoted_name % (), name)

        self.assertEqual(quoted_name % (), name)



    @unittest.skipUnless(connection.vendor == 'oracle',

                         "No need to check Oracle cursor semantics")

tests/regressiontests/queries/tests.py

+6 −6
Original line number Diff line number Diff line
@@ -1293,9 +1293,9 @@ class Queries4Tests(BaseQuerysetTest): 
        q1 = Author.objects.filter(report__name='r5')

        q2 = Author.objects.filter(report__name='r4').filter(report__name='r1')

        combined = q1|q2

        self.assertEquals(str(combined.query).count('JOIN'), 2)

        self.assertEquals(len(combined), 1)

        self.assertEquals(combined[0].name, 'a1')

        self.assertEqual(str(combined.query).count('JOIN'), 2)

        self.assertEqual(len(combined), 1)

        self.assertEqual(combined[0].name, 'a1')



    def test_ticket7095(self):

        # Updates that are filtered on the model being updated are somewhat
@@ -1644,8 +1644,8 @@ class NullableRelOrderingTests(TestCase): 
        # and that join must be LEFT join. The already existing join to related

        # objects must be kept INNER. So, we have both a INNER and a LEFT join

        # in the query.

        self.assertEquals(str(qs.query).count('LEFT'), 1)

        self.assertEquals(str(qs.query).count('INNER'), 1)

        self.assertEqual(str(qs.query).count('LEFT'), 1)

        self.assertEqual(str(qs.query).count('INNER'), 1)

        self.assertQuerysetEqual(

            qs,

            ['<Plaything: p2>']
@@ -2452,7 +2452,7 @@ class ReverseJoinTrimmingTest(TestCase): 
        t = Tag.objects.create()

        qs = Tag.objects.filter(annotation__tag=t.pk)

        self.assertIn('INNER JOIN', str(qs.query))

        self.assertEquals(list(qs), [])

        self.assertEqual(list(qs), [])



class JoinReuseTest(TestCase):

    """