Commit 8d35fd4c authored by Ian Clelland's avatar Ian Clelland Committed by Luke Plant
Browse files

Use new TestCase methods for equality comparisons

parent 089d9ca1

django/contrib/formtools/tests/wizard/cookiestorage.py

+1 −1
Original line number Diff line number Diff line
@@ -43,5 +43,5 @@ class TestCookieStorage(TestStorage, TestCase): 
        storage.init_data()

        storage.update_response(response)

        unsigned_cookie_data = cookie_signer.unsign(response.cookies[storage.prefix].value)

        self.assertEqual(json.loads(unsigned_cookie_data),

        self.assertJSONEqual(unsigned_cookie_data,

            {"step_files": {}, "step": None, "extra_data": {}, "step_data": {}})

tests/modeltests/field_subclassing/tests.py

+5 −1
Original line number Diff line number Diff line
@@ -61,7 +61,11 @@ class CustomField(TestCase): 


        # Serialization works, too.

        stream = serializers.serialize("json", MyModel.objects.all())

        self.assertEqual(stream, '[{"pk": %d, "model": "field_subclassing.mymodel", "fields": {"data": "12", "name": "m"}}]' % m1.pk)

        self.assertJSONEqual(stream, [{

            "pk": m1.pk,

            "model": "field_subclassing.mymodel",

            "fields": {"data": "12", "name": "m"}

        }])



        obj = list(serializers.deserialize("json", stream))[0]

        self.assertEqual(obj.object, m)

tests/modeltests/fixtures/tests.py

+11 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class TestCaseFixtureLoadingTests(TestCase): 
        ])





class FixtureLoadingTests(TestCase):

class DumpDataAssertMixin(object):



    def _dumpdata_assert(self, args, output, format='json', natural_keys=False,

                         use_base_manager=False, exclude_list=[]):
@@ -34,8 +34,16 @@ class FixtureLoadingTests(TestCase): 
                                                      'use_base_manager': use_base_manager,

                                                      'exclude': exclude_list})

        command_output = new_io.getvalue().strip()

        if format == "json":

            self.assertJSONEqual(command_output, output)

        elif format == "xml":

            self.assertXMLEqual(command_output, output)

        else:

            self.assertEqual(command_output, output)





class FixtureLoadingTests(DumpDataAssertMixin, TestCase):



    def test_initial_data(self):

        # syncdb introduces 1 initial data object from initial_data.json.

        self.assertQuerysetEqual(Book.objects.all(), [
@@ -290,12 +298,7 @@ class FixtureLoadingTests(TestCase): 
<django-objects version="1.0"><object pk="1" model="fixtures.category"><field type="CharField" name="title">News Stories</field><field type="TextField" name="description">Latest news stories</field></object><object pk="2" model="fixtures.article"><field type="CharField" name="headline">Poker has no place on ESPN</field><field type="DateTimeField" name="pub_date">2006-06-16T12:00:00</field></object><object pk="3" model="fixtures.article"><field type="CharField" name="headline">Time to reform copyright</field><field type="DateTimeField" name="pub_date">2006-06-16T13:00:00</field></object><object pk="1" model="fixtures.tag"><field type="CharField" name="name">copyright</field><field to="contenttypes.contenttype" name="tagged_type" rel="ManyToOneRel"><natural>fixtures</natural><natural>article</natural></field><field type="PositiveIntegerField" name="tagged_id">3</field></object><object pk="2" model="fixtures.tag"><field type="CharField" name="name">law</field><field to="contenttypes.contenttype" name="tagged_type" rel="ManyToOneRel"><natural>fixtures</natural><natural>article</natural></field><field type="PositiveIntegerField" name="tagged_id">3</field></object><object pk="1" model="fixtures.person"><field type="CharField" name="name">Django Reinhardt</field></object><object pk="2" model="fixtures.person"><field type="CharField" name="name">Stephane Grappelli</field></object><object pk="3" model="fixtures.person"><field type="CharField" name="name">Prince</field></object><object pk="10" model="fixtures.book"><field type="CharField" name="name">Achieving self-awareness of Python programs</field><field to="fixtures.person" name="authors" rel="ManyToManyRel"></field></object></django-objects>""", format='xml', natural_keys=True)





class FixtureTransactionTests(TransactionTestCase):

    def _dumpdata_assert(self, args, output, format='json'):

        new_io = six.StringIO()

        management.call_command('dumpdata', *args, **{'format': format, 'stdout': new_io})

        command_output = new_io.getvalue().strip()

        self.assertEqual(command_output, output)

class FixtureTransactionTests(DumpDataAssertMixin, TransactionTestCase):



    @skipUnlessDBFeature('supports_forward_references')

    def test_format_discovery(self):

tests/regressiontests/admin_changelist/tests.py

+3 −4
Original line number Diff line number Diff line
@@ -122,12 +122,11 @@ class ChangeListTests(TestCase): 
        table_output = template.render(context)

        # make sure that hidden fields are in the correct place

        hiddenfields_div = '<div class="hiddenfields"><input type="hidden" name="form-0-id" value="%d" id="id_form-0-id" /></div>' % new_child.id

        self.assertFalse(table_output.find(hiddenfields_div) == -1,

            'Failed to find hidden fields in: %s' % table_output)

        self.assertInHTML(hiddenfields_div, table_output, msg_prefix='Failed to find hidden fields')



        # make sure that list editable fields are rendered in divs correctly

        editable_name_field = '<input name="form-0-name" value="name" class="vTextField" maxlength="30" type="text" id="id_form-0-name" />'

        self.assertFalse('<td>%s</td>' % editable_name_field == -1,

            'Failed to find "name" list_editable field in: %s' % table_output)

        self.assertInHTML('<td>%s</td>' % editable_name_field, table_output, msg_prefix='Failed to find "name" list_editable field')



    def test_result_list_editable(self):

        """

tests/regressiontests/fixtures_regress/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ class TestFixtures(TestCase): 
            format='json',

            stdout=stdout

        )

        self.assertEqual(

        self.assertJSONEqual(

            stdout.getvalue(),

            """[{"pk": %d, "model": "fixtures_regress.widget", "fields": {"name": "grommet"}}]"""

            % widget.pk
@@ -519,7 +519,7 @@ class NaturalKeyFixtureTests(TestCase): 
            use_natural_keys=True,

            stdout=stdout,

        )

        self.assertEqual(

        self.assertJSONEqual(

            stdout.getvalue(),

            """[{"pk": 2, "model": "fixtures_regress.store", "fields": {"main": null, "name": "Amazon"}}, {"pk": 3, "model": "fixtures_regress.store", "fields": {"main": null, "name": "Borders"}}, {"pk": 4, "model": "fixtures_regress.person", "fields": {"name": "Neal Stephenson"}}, {"pk": 1, "model": "fixtures_regress.book", "fields": {"stores": [["Amazon"], ["Borders"]], "name": "Cryptonomicon", "author": ["Neal Stephenson"]}}]"""

        )