openstack/solum
Code Issues Proposed changes

Add missing handler mocks in Controllers test

Browse Source 
Also replaced get_all handler mocks return_value from empty array
to list of FakeObjects

Closes-Bug: #1279775
Change-Id: Ib9fcea7430ae2b73e02dc193b348d6960ca63841
This commit is contained in:
Pierre Padrixe
2014-04-28 15:15:55 +02:00
parent 235f7eb0ae
commit 2afbbf01f1
8 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
solum/tests/api/v1/test_assembly.py
View File

@@ -141,8 +141,17 @@ class TestAssembliesController(base.BaseTestCase):
def test_assemblies_get_all(self, AssemblyHandler,
resp_mock, request_mock):
hand_get = AssemblyHandler.return_value.get_all
hand_get.return_value = []
fake_assembly = fakes.FakeAssembly()
hand_get.return_value = [fake_assembly]
resp = assembly.AssembliesController().get_all()
self.assertEqual(fake_assembly.name, resp['result'][0].name)
self.assertEqual(fake_assembly.project_id,
resp['result'][0].project_id)
self.assertEqual(fake_assembly.uuid, resp['result'][0].uuid)
self.assertEqual(fake_assembly.status, resp['result'][0].status)
self.assertEqual(fake_assembly.user_id, resp['result'][0].user_id)
self.assertEqual(fake_assembly.application_uri,
resp['result'][0].application_uri)
hand_get.assert_called_with()
self.assertEqual(200, resp_mock.status)
self.assertIsNotNone(resp)

7
solum/tests/api/v1/test_component.py
View File

@@ -116,9 +116,16 @@ class TestComponentsController(base.BaseTestCase):
objects.load()
def test_components_get_all(self, handler_mock, resp_mock, request_mock):
hand_get_all = handler_mock.return_value.get_all
fake_component = fakes.FakeComponent()
hand_get_all.return_value = [fake_component]
obj = component.ComponentsController()
resp = obj.get_all()
hand_get_all.assert_called_with()
self.assertIsNotNone(resp)
self.assertEqual(fake_component.name, resp['result'][0].name)
self.assertEqual(fake_component.description,
resp['result'][0].description)
self.assertEqual(200, resp_mock.status)
def test_components_post(self, handler_mock, resp_mock, request_mock):

13
solum/tests/api/v1/test_extension.py
View File

@@ -119,9 +119,22 @@ class TestExtensionsController(base.BaseTestCase):
objects.load()
def test_extensions_get_all(self, handler_mock, resp_mock, request_mock):
hand_get_all = handler_mock.return_value.get_all
fake_extension = fakes.FakeExtension()
hand_get_all.return_value = [fake_extension]
obj = controller.ExtensionsController()
resp = obj.get_all()
self.assertIsNotNone(resp)
self.assertEqual(fake_extension.name, resp['result'][0].name)
self.assertEqual(fake_extension.documentation,
resp['result'][0].documentation)
self.assertEqual(fake_extension.description,
resp['result'][0].description)
self.assertEqual(fake_extension.project_id,
resp['result'][0].project_id)
self.assertEqual(fake_extension.uuid, resp['result'][0].uuid)
self.assertEqual(fake_extension.version, resp['result'][0].version)
hand_get_all.assert_called_with()
self.assertEqual(200, resp_mock.status)
def test_extensions_post(self, handler_mock, resp_mock, request_mock):

11
solum/tests/api/v1/test_operation.py
View File

@@ -116,10 +116,19 @@ class TestOperationsController(base.BaseTestCase):
def test_operations_get_all(self, handler_mock, resp_mock, request_mock):
hand_get_all = handler_mock.return_value.get_all
hand_get_all.return_value = [fakes.FakeOperation()]
fake_operation = fakes.FakeOperation()
hand_get_all.return_value = [fake_operation]
obj = operation.OperationsController()
resp = obj.get_all()
self.assertIsNotNone(resp)
self.assertEqual(fake_operation.name, resp['result'][0].name)
self.assertEqual(fake_operation.documentation,
resp['result'][0].documentation)
self.assertEqual(fake_operation.description,
resp['result'][0].description)
self.assertEqual(fake_operation.project_id,
resp['result'][0].project_id)
self.assertEqual(fake_operation.uuid, resp['result'][0].uuid)
self.assertEqual(200, resp_mock.status)
def test_operations_post(self, handler_mock, resp_mock, request_mock):

7
solum/tests/api/v1/test_plan.py
View File

@@ -109,9 +109,14 @@ class TestPlansController(base.BaseTestCase):
def test_plans_get_all(self, PlanHandler, resp_mock, request_mock):
hand_get = PlanHandler.return_value.get_all
hand_get.return_value = []
fake_plan = fakes.FakePlan()
hand_get.return_value = [fake_plan]
resp = plan.PlansController().get_all()
self.assertIsNotNone(resp)
self.assertEqual(fake_plan.name, resp['result'][0].name)
self.assertEqual(fake_plan.project_id,
resp['result'][0].project_id)
self.assertEqual(fake_plan.uuid, resp['result'][0].uuid)
self.assertEqual(200, resp_mock.status)
hand_get.assert_called_with()

11
solum/tests/api/v1/test_sensor.py
View File

@@ -155,9 +155,20 @@ class TestSensorsController(base.BaseTestCase):
objects.load()
def test_sensors_get_all(self, handler_mock, resp_mock, request_mock):
hand_get_all = handler_mock.return_value.get_all
fake_sensor = fakes.FakeSensor()
hand_get_all.return_value = [fake_sensor]
obj = controller.SensorsController()
resp = obj.get_all()
self.assertIsNotNone(resp)
self.assertEqual(fake_sensor.name, resp['result'][0].name)
self.assertEqual(fake_sensor.documentation,
resp['result'][0].documentation)
self.assertEqual(fake_sensor.description,
resp['result'][0].description)
self.assertEqual(fake_sensor.project_id, resp['result'][0].project_id)
self.assertEqual(fake_sensor.uuid, resp['result'][0].uuid)
hand_get_all.assert_called_with()
self.assertEqual(200, resp_mock.status)
def test_sensors_post(self, handler_mock, resp_mock, request_mock):

9
solum/tests/api/v1/test_service.py
View File

@@ -114,9 +114,18 @@ class TestServicesController(base.BaseTestCase):
objects.load()
def test_services_get_all(self, handler_mock, resp_mock, request_mock):
hand_get_all = handler_mock.return_value.get_all
fake_service = fakes.FakeService()
hand_get_all.return_value = [fake_service]
obj = service.ServicesController()
resp = obj.get_all()
self.assertIsNotNone(resp)
self.assertEqual(fake_service.name, resp['result'][0].name)
self.assertEqual(fake_service.description,
resp['result'][0].description)
self.assertEqual(fake_service.project_id, resp['result'][0].project_id)
self.assertEqual(fake_service.uuid, resp['result'][0].uuid)
hand_get_all.assert_called_with()
self.assertEqual(200, resp_mock.status)
def test_services_post(self, handler_mock, resp_mock, request_mock):

1
solum/tests/fakes.py
View File

@@ -164,6 +164,7 @@ class FakeAssembly(mock.Mock):
def as_dict(self):
return dict(user_id=self.user_id,
project_id=self.project_id,
application_uri=self.application_uri,
uuid=self.uuid,
id=self.id,
name=self.name,