Merge "Fix for dicts checking in tests"
This commit is contained in:
commit
c944943450
|
@ -41,13 +41,13 @@ class TestComponents(BaseTest):
|
|||
self._fixture()
|
||||
res = self.client.get('/components')
|
||||
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):
|
||||
self._fixture()
|
||||
res = self.client.get('/components/7')
|
||||
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):
|
||||
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]['id'] = 6
|
||||
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'],
|
||||
components.component_fields, json)
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ class TestEnvironments(BaseTest):
|
|||
res = self.client.get('/environments')
|
||||
self.assertEqual(200, res.status_code)
|
||||
self.assertEqual(1, len(res.json))
|
||||
self.assertItemsEqual(
|
||||
self.assertEqual(
|
||||
{'id': 9, 'components': [7], 'hierarchy_levels': ['lvl1', 'lvl2']},
|
||||
res.json[0]
|
||||
)
|
||||
|
@ -37,7 +37,7 @@ class TestEnvironments(BaseTest):
|
|||
self._fixture()
|
||||
res = self.client.get('/environments/9')
|
||||
self.assertEqual(200, res.status_code)
|
||||
self.assertItemsEqual(
|
||||
self.assertEqual(
|
||||
{'id': 9, 'components': [7], 'hierarchy_levels': ['lvl1', 'lvl2']},
|
||||
res.json
|
||||
)
|
||||
|
@ -52,7 +52,7 @@ class TestEnvironments(BaseTest):
|
|||
res = self.client.post('/environments', data=json)
|
||||
self.assertEqual(res.status_code, 201)
|
||||
json['id'] = res.json['id']
|
||||
self.assertItemsEqual(json, res.json)
|
||||
self.assertEqual(json, res.json)
|
||||
self._assert_db_effect(
|
||||
db.Environment, res.json['id'],
|
||||
environments.environment_fields, json)
|
||||
|
@ -66,7 +66,7 @@ class TestEnvironments(BaseTest):
|
|||
}
|
||||
res = self.client.post('/environments', data=json)
|
||||
self.assertEqual(201, res.status_code)
|
||||
self.assertItemsEqual(json, res.json)
|
||||
self.assertEqual(json, res.json)
|
||||
self._assert_db_effect(
|
||||
db.Environment, 42, environments.environment_fields, json)
|
||||
|
||||
|
@ -101,7 +101,7 @@ class TestEnvironments(BaseTest):
|
|||
self.assertEqual(res.status_code, 201)
|
||||
json['id'] = res.json['id']
|
||||
json['components'] = [7]
|
||||
self.assertItemsEqual(json, res.json)
|
||||
self.assertEqual(json, res.json)
|
||||
self._assert_db_effect(
|
||||
db.Environment, res.json['id'],
|
||||
environments.environment_fields, json)
|
||||
|
@ -192,7 +192,7 @@ class TestEnvironments(BaseTest):
|
|||
)
|
||||
self.assertEqual(204, res.status_code)
|
||||
actual = self.client.get(environment_url).json
|
||||
self.assertItemsEqual(initial, actual)
|
||||
self.assertEqual(initial, actual)
|
||||
|
||||
def test_put_environment_component_not_found(self):
|
||||
self._fixture()
|
||||
|
@ -231,7 +231,7 @@ class TestEnvironments(BaseTest):
|
|||
)
|
||||
self.assertEqual(204, res.status_code)
|
||||
actual = self.client.get(environment_url).json
|
||||
self.assertItemsEqual(initial, actual)
|
||||
self.assertEqual(initial, actual)
|
||||
self.check_hierarchy_levels(actual['hierarchy_levels'])
|
||||
|
||||
def test_put_environment_hierarchy_levels_remove_level(self):
|
||||
|
|
|
@ -55,7 +55,7 @@ class TestResourceDefinitions(BaseTest):
|
|||
res = self.client.get(self.collection_url)
|
||||
self.assertEqual(200, res.status_code)
|
||||
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):
|
||||
self._fixture()
|
||||
|
@ -90,7 +90,7 @@ class TestResourceDefinitions(BaseTest):
|
|||
res_id = self._resource_json['id']
|
||||
res = self.client.get(self.object_url.format(res_id))
|
||||
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):
|
||||
res_id = self._resource_json['id']
|
||||
|
@ -129,7 +129,7 @@ class TestResourceDefinitions(BaseTest):
|
|||
data=data)
|
||||
self.assertEqual(204, res.status_code)
|
||||
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
|
||||
res = self.client.put(
|
||||
|
@ -138,7 +138,7 @@ class TestResourceDefinitions(BaseTest):
|
|||
)
|
||||
self.assertEqual(204, res.status_code)
|
||||
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):
|
||||
self._fixture()
|
||||
|
@ -149,4 +149,4 @@ class TestResourceDefinitions(BaseTest):
|
|||
res = self.client.put(self.object_url.format(res_id), data=data)
|
||||
self.assertEqual(204, res.status_code)
|
||||
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)
|
||||
|
|
|
@ -78,7 +78,7 @@ class BaseTest(base.TestCase):
|
|||
obj = model.query.get(key)
|
||||
self.assertIsNotNone(obj)
|
||||
marshalled = flask_restful.marshal(obj, fields)
|
||||
self.assertItemsEqual(expected, marshalled)
|
||||
self.assertEqual(expected, marshalled)
|
||||
|
||||
def _assert_not_in_db(self, model, key):
|
||||
with self.app.app_context():
|
||||
|
|
Loading…
Reference in New Issue