openstack
/
tuning-box
Code Issues Proposed changes

Fix for dicts checking in tests 

When assertItemsEqual is used for dicts only their keys are used
for checking.

Change-Id: Ia15fdf0ed6ff95d7710e61b764b2cd9496a1a9bb
This commit is contained in:
Alexander Kislitsky 2016-08-17 11:45:15 +03:00
parent 03b9cd3a03
commit df1550183e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tuning_box/tests/library/test_components.py
View File

@ -41,13 +41,13 @@ class TestComponents(BaseTest):
self._fixture() self._fixture()
res = self.client.get('/components') res = self.client.get('/components')
self.assertEqual(200, res.status_code) self.assertEqual(200, res.status_code)
self.assertItemsEqual(self._component_json, res.json[0]) self.assertEqual(self._component_json, res.json[0])
def test_get_one_component(self): def test_get_one_component(self):
self._fixture() self._fixture()
res = self.client.get('/components/7') res = self.client.get('/components/7')
self.assertEqual(200, res.status_code) self.assertEqual(200, res.status_code)
self.assertItemsEqual(self._component_json, res.json) self.assertEqual(self._component_json, res.json)
def test_get_one_component_404(self): def test_get_one_component_404(self):
res = self.client.get('/components/7') res = self.client.get('/components/7')
@ -104,7 +104,7 @@ class TestComponents(BaseTest):
json['resource_definitions'][0]['component_id'] = json['id'] json['resource_definitions'][0]['component_id'] = json['id']
json['resource_definitions'][0]['id'] = 6 json['resource_definitions'][0]['id'] = 6
json['resource_definitions'][0]['content'] = None json['resource_definitions'][0]['content'] = None
self.assertItemsEqual(json, res.json) self.assertEqual(json, res.json)
self._assert_db_effect(db.Component, res.json['id'], self._assert_db_effect(db.Component, res.json['id'],
components.component_fields, json) components.component_fields, json)

14
tuning_box/tests/library/test_environments.py
View File

@ -28,7 +28,7 @@ class TestEnvironments(BaseTest):
res = self.client.get('/environments') res = self.client.get('/environments')
self.assertEqual(200, res.status_code) self.assertEqual(200, res.status_code)
self.assertEqual(1, len(res.json)) self.assertEqual(1, len(res.json))
self.assertItemsEqual( self.assertEqual(
{'id': 9, 'components': [7], 'hierarchy_levels': ['lvl1', 'lvl2']}, {'id': 9, 'components': [7], 'hierarchy_levels': ['lvl1', 'lvl2']},
res.json[0] res.json[0]
) )
@ -37,7 +37,7 @@ class TestEnvironments(BaseTest):
self._fixture() self._fixture()
res = self.client.get('/environments/9') res = self.client.get('/environments/9')
self.assertEqual(200, res.status_code) self.assertEqual(200, res.status_code)
self.assertItemsEqual( self.assertEqual(
{'id': 9, 'components': [7], 'hierarchy_levels': ['lvl1', 'lvl2']}, {'id': 9, 'components': [7], 'hierarchy_levels': ['lvl1', 'lvl2']},
res.json res.json
) )
@ -52,7 +52,7 @@ class TestEnvironments(BaseTest):
res = self.client.post('/environments', data=json) res = self.client.post('/environments', data=json)
self.assertEqual(res.status_code, 201) self.assertEqual(res.status_code, 201)
json['id'] = res.json['id'] json['id'] = res.json['id']
self.assertItemsEqual(json, res.json) self.assertEqual(json, res.json)
self._assert_db_effect( self._assert_db_effect(
db.Environment, res.json['id'], db.Environment, res.json['id'],
environments.environment_fields, json) environments.environment_fields, json)
@ -66,7 +66,7 @@ class TestEnvironments(BaseTest):
} }
res = self.client.post('/environments', data=json) res = self.client.post('/environments', data=json)
self.assertEqual(201, res.status_code) self.assertEqual(201, res.status_code)
self.assertItemsEqual(json, res.json) self.assertEqual(json, res.json)
self._assert_db_effect( self._assert_db_effect(
db.Environment, 42, environments.environment_fields, json) db.Environment, 42, environments.environment_fields, json)
@ -101,7 +101,7 @@ class TestEnvironments(BaseTest):
self.assertEqual(res.status_code, 201) self.assertEqual(res.status_code, 201)
json['id'] = res.json['id'] json['id'] = res.json['id']
json['components'] = [7] json['components'] = [7]
self.assertItemsEqual(json, res.json) self.assertEqual(json, res.json)
self._assert_db_effect( self._assert_db_effect(
db.Environment, res.json['id'], db.Environment, res.json['id'],
environments.environment_fields, json) environments.environment_fields, json)
@ -192,7 +192,7 @@ class TestEnvironments(BaseTest):
) )
self.assertEqual(204, res.status_code) self.assertEqual(204, res.status_code)
actual = self.client.get(environment_url).json actual = self.client.get(environment_url).json
self.assertItemsEqual(initial, actual) self.assertEqual(initial, actual)
def test_put_environment_component_not_found(self): def test_put_environment_component_not_found(self):
self._fixture() self._fixture()
@ -231,7 +231,7 @@ class TestEnvironments(BaseTest):
) )
self.assertEqual(204, res.status_code) self.assertEqual(204, res.status_code)
actual = self.client.get(environment_url).json actual = self.client.get(environment_url).json
self.assertItemsEqual(initial, actual) self.assertEqual(initial, actual)
self.check_hierarchy_levels(actual['hierarchy_levels']) self.check_hierarchy_levels(actual['hierarchy_levels'])
def test_put_environment_hierarchy_levels_remove_level(self): def test_put_environment_hierarchy_levels_remove_level(self):

10
tuning_box/tests/library/test_resource_definitions.py
View File

@ -55,7 +55,7 @@ class TestResourceDefinitions(BaseTest):
res = self.client.get(self.collection_url) res = self.client.get(self.collection_url)
self.assertEqual(200, res.status_code) self.assertEqual(200, res.status_code)
self.assertEqual(1, len(res.json)) self.assertEqual(1, len(res.json))
self.assertItemsEqual(self._resource_json, res.json[0]) self.assertEqual(self._resource_json, res.json[0])
def test_get_definitions_filtration(self): def test_get_definitions_filtration(self):
self._fixture() self._fixture()
@ -90,7 +90,7 @@ class TestResourceDefinitions(BaseTest):
res_id = self._resource_json['id'] res_id = self._resource_json['id']
res = self.client.get(self.object_url.format(res_id)) res = self.client.get(self.object_url.format(res_id))
self.assertEqual(200, res.status_code) self.assertEqual(200, res.status_code)
self.assertItemsEqual(self._resource_json, res.json) self.assertEqual(self._resource_json, res.json)
def test_get_one_resource_definition_404(self): def test_get_one_resource_definition_404(self):
res_id = self._resource_json['id'] res_id = self._resource_json['id']
@ -129,7 +129,7 @@ class TestResourceDefinitions(BaseTest):
data=data) data=data)
self.assertEqual(204, res.status_code) self.assertEqual(204, res.status_code)
actual_res_def = self.client.get(self.object_url.format(res_id)).json actual_res_def = self.client.get(self.object_url.format(res_id)).json
self.assertItemsEqual(data, actual_res_def) self.assertEqual(data, actual_res_def)
# Restoring resource_definition values # Restoring resource_definition values
res = self.client.put( res = self.client.put(
@ -138,7 +138,7 @@ class TestResourceDefinitions(BaseTest):
) )
self.assertEqual(204, res.status_code) self.assertEqual(204, res.status_code)
actual_res_def = self.client.get(self.object_url.format(res_id)).json actual_res_def = self.client.get(self.object_url.format(res_id)).json
self.assertItemsEqual(self._resource_json, actual_res_def) self.assertEqual(self._resource_json, actual_res_def)
def test_put_resource_definition_ignore_changing_id(self): def test_put_resource_definition_ignore_changing_id(self):
self._fixture() self._fixture()
@ -149,4 +149,4 @@ class TestResourceDefinitions(BaseTest):
res = self.client.put(self.object_url.format(res_id), data=data) res = self.client.put(self.object_url.format(res_id), data=data)
self.assertEqual(204, res.status_code) self.assertEqual(204, res.status_code)
actual_res_def = self.client.get(self.object_url.format(res_id)).json actual_res_def = self.client.get(self.object_url.format(res_id)).json
self.assertItemsEqual(self._resource_json, actual_res_def) self.assertEqual(self._resource_json, actual_res_def)

2
tuning_box/tests/test_app.py
View File

@ -78,7 +78,7 @@ class BaseTest(base.TestCase):
obj = model.query.get(key) obj = model.query.get(key)
self.assertIsNotNone(obj) self.assertIsNotNone(obj)
marshalled = flask_restful.marshal(obj, fields) marshalled = flask_restful.marshal(obj, fields)
self.assertItemsEqual(expected, marshalled) self.assertEqual(expected, marshalled)
def _assert_not_in_db(self, model, key): def _assert_not_in_db(self, model, key):
with self.app.app_context(): with self.app.app_context():