From 7cd1f611da2a1054ef89b92be1d020670edc49a9 Mon Sep 17 00:00:00 2001 From: qinchunhua Date: Fri, 29 Jul 2016 01:14:16 -0400 Subject: [PATCH] Replace assertDictEqual() with assertEqual() In unittesttools, assertDictEqual() and assertEqual() are implemented by using '!=' operator. But assertEqual() can handle dict, list, set and so on. So we should use assertEqual() to make the test simpler. TrivialFix. Change-Id: Ie6a8087c3d81d54f99a38b5950ac1834a51cb8d1 --- designate/tests/unit/test_api/test_admin_api.py | 6 +++--- designate/tests/unit/test_api/test_api_v2.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designate/tests/unit/test_api/test_admin_api.py b/designate/tests/unit/test_api/test_admin_api.py index 430c0906a..d7c3ab6b2 100644 --- a/designate/tests/unit/test_api/test_admin_api.py +++ b/designate/tests/unit/test_api/test_admin_api.py @@ -50,15 +50,15 @@ class TestAdminAPI(TestCase): request = MockRequest(GET=dict(limit="max")) links = bv._get_collection_links(request, item_list) - self.assertDictEqual(links, dict(self=None)) + self.assertEqual(links, dict(self=None)) request = MockRequest(GET=dict(limit="MAX")) links = bv._get_collection_links(request, item_list) - self.assertDictEqual(links, dict(self=None)) + self.assertEqual(links, dict(self=None)) request = MockRequest(GET=dict(limit="200")) links = bv._get_collection_links(request, item_list) - self.assertDictEqual(links, dict(self=None, next=None)) + self.assertEqual(links, dict(self=None, next=None)) request = MockRequest(GET=dict(limit="BOGUS_STRING")) self.assertRaises( diff --git a/designate/tests/unit/test_api/test_api_v2.py b/designate/tests/unit/test_api/test_api_v2.py index 622cd7bfe..80dc541c9 100644 --- a/designate/tests/unit/test_api/test_api_v2.py +++ b/designate/tests/unit/test_api/test_api_v2.py @@ -46,15 +46,15 @@ class TestAPIv2(TestCase): item_list = range(200) request = MockRequest(GET=dict(limit="max")) links = base.APIv2Adapter._get_collection_links(item_list, request) - self.assertDictEqual(links, dict(self=None)) + self.assertEqual(links, dict(self=None)) request = MockRequest(GET=dict(limit="MAX")) links = base.APIv2Adapter._get_collection_links(item_list, request) - self.assertDictEqual(links, dict(self=None)) + self.assertEqual(links, dict(self=None)) request = MockRequest(GET=dict(limit="200")) links = base.APIv2Adapter._get_collection_links(item_list, request) - self.assertDictEqual(links, dict(self=None, next=None)) + self.assertEqual(links, dict(self=None, next=None)) request = MockRequest(GET=dict(limit="BOGUS_STRING")) self.assertRaises(