From 85b3503c7e775076a758ef5436014286342e3445 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 19 Nov 2018 22:28:07 +0100 Subject: [PATCH] Removed using of deprecated assertDictContainsSubset(). Deprecated since Python 3.2. --- tests/renderers/test_openapi_renderer.py | 7 +++---- tests/renderers/test_swagger.py | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/renderers/test_openapi_renderer.py b/tests/renderers/test_openapi_renderer.py index 2ea621a7..5920b971 100644 --- a/tests/renderers/test_openapi_renderer.py +++ b/tests/renderers/test_openapi_renderer.py @@ -95,10 +95,9 @@ def setUp(self): def test_security_definitions_included_when_defined(self): self.swagger_settings.SECURITY_DEFINITIONS = {'foo': 'bar'} - expected = { - 'securityDefinitions': self.swagger_settings.SECURITY_DEFINITIONS - } - self.assertDictContainsSubset(expected, self.sut()) + sut = self.sut() + self.assertIn('securityDefinitions', sut) + self.assertEqual(sut['securityDefinitions'], self.swagger_settings.SECURITY_DEFINITIONS) def test_security_definitions_not_present_when_none(self): self.swagger_settings.SECURITY_DEFINITIONS = None diff --git a/tests/renderers/test_swagger.py b/tests/renderers/test_swagger.py index ea9e762b..fa997955 100644 --- a/tests/renderers/test_swagger.py +++ b/tests/renderers/test_swagger.py @@ -68,8 +68,8 @@ def test_set_context_sets_auth_urls(self): urls = {'fizz': 'buzz'} with patch.object(self.sut, 'get_auth_urls', return_value=urls): self.sut.set_context(data, self.renderer_context) - - self.assertDictContainsSubset(urls, self.renderer_context) + self.assertIn('fizz', self.renderer_context) + self.assertEqual(self.renderer_context['fizz'], 'buzz') def test_set_context_sets_ui_settings(self): data = MagicMock() @@ -136,8 +136,8 @@ def test_get_ui_settings_without_validator_url(self): def test_validator_url_none_when_set(self): self.swagger_settings.VALIDATOR_URL = None result = self.sut.get_ui_settings() - - self.assertDictContainsSubset({'validatorUrl': None}, result) + self.assertIn('validatorUrl', result) + self.assertIsNone(result['validatorUrl']) def test_validator_url_not_present_when_empty_string(self): """