Merge "Improve controller get() tests by adding return_value to handler mocks"
This commit is contained in:
		@@ -33,9 +33,18 @@ class TestAssemblyController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_assembly_get(self, AssemblyHandler, resp_mock, request_mock):
 | 
			
		||||
        hand_get = AssemblyHandler.return_value.get
 | 
			
		||||
        hand_get.return_value = fakes.FakeAssembly()
 | 
			
		||||
        fake_assembly = fakes.FakeAssembly()
 | 
			
		||||
        hand_get.return_value = fake_assembly
 | 
			
		||||
        cont = assembly.AssemblyController('test_id')
 | 
			
		||||
        cont.get()
 | 
			
		||||
        resp = cont.get()
 | 
			
		||||
        self.assertIsNotNone(fake_assembly)
 | 
			
		||||
        self.assertEqual(fake_assembly.name, resp['result'].name)
 | 
			
		||||
        self.assertEqual(fake_assembly.project_id, resp['result'].project_id)
 | 
			
		||||
        self.assertEqual(fake_assembly.uuid, resp['result'].uuid)
 | 
			
		||||
        self.assertEqual(fake_assembly.status, resp['result'].status)
 | 
			
		||||
        self.assertEqual(fake_assembly.user_id, resp['result'].user_id)
 | 
			
		||||
        self.assertEqual(fake_assembly.application_uri,
 | 
			
		||||
                         resp['result'].application_uri)
 | 
			
		||||
        hand_get.assert_called_with('test_id')
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -33,9 +33,14 @@ class TestComponentController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_component_get(self, ComponentHandler, resp_mock, request_mock):
 | 
			
		||||
        hand_get = ComponentHandler.return_value.get
 | 
			
		||||
        hand_get.return_value = fakes.FakeComponent()
 | 
			
		||||
        fake_component = fakes.FakeComponent()
 | 
			
		||||
        hand_get.return_value = fake_component
 | 
			
		||||
        obj = component.ComponentController('test_id')
 | 
			
		||||
        obj.get()
 | 
			
		||||
        resp = obj.get()
 | 
			
		||||
        self.assertIsNotNone(resp)
 | 
			
		||||
        self.assertEqual(fake_component.name, resp['result'].name)
 | 
			
		||||
        self.assertEqual(fake_component.description,
 | 
			
		||||
                         resp['result'].description)
 | 
			
		||||
        hand_get.assert_called_with('test_id')
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -34,9 +34,20 @@ class TestExtensionController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_extension_get(self, handler_mock, resp_mock, request_mock):
 | 
			
		||||
        handler_get = handler_mock.return_value.get
 | 
			
		||||
        handler_get.return_value = fakes.FakeExtension()
 | 
			
		||||
        fake_extension = fakes.FakeExtension()
 | 
			
		||||
        handler_get.return_value = fake_extension
 | 
			
		||||
        obj = controller.ExtensionController('test_id')
 | 
			
		||||
        result = obj.get()
 | 
			
		||||
        self.assertIsNotNone(result)
 | 
			
		||||
        self.assertEqual(fake_extension.name, result['result'].name)
 | 
			
		||||
        self.assertEqual(fake_extension.documentation,
 | 
			
		||||
                         result['result'].documentation)
 | 
			
		||||
        self.assertEqual(fake_extension.description,
 | 
			
		||||
                         result['result'].description)
 | 
			
		||||
        self.assertEqual(fake_extension.project_id,
 | 
			
		||||
                         result['result'].project_id)
 | 
			
		||||
        self.assertEqual(fake_extension.uuid, result['result'].uuid)
 | 
			
		||||
        self.assertEqual(fake_extension.version, result['result'].version)
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
        self.assertIsNotNone(result)
 | 
			
		||||
        handler_get.assert_called_once_with('test_id')
 | 
			
		||||
 
 | 
			
		||||
@@ -35,9 +35,18 @@ class TestOperationController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_operation_get(self, OperationHandler, resp_mock, request_mock):
 | 
			
		||||
        hand_get = OperationHandler.return_value.get
 | 
			
		||||
        hand_get.return_value = fakes.FakeOperation()
 | 
			
		||||
        fake_operation = fakes.FakeOperation()
 | 
			
		||||
        hand_get.return_value = fake_operation
 | 
			
		||||
        cont = operation.OperationController('test_id')
 | 
			
		||||
        cont.get()
 | 
			
		||||
        resp = cont.get()
 | 
			
		||||
        self.assertIsNotNone(resp)
 | 
			
		||||
        self.assertEqual(fake_operation.name, resp['result'].name)
 | 
			
		||||
        self.assertEqual(fake_operation.documentation,
 | 
			
		||||
                         resp['result'].documentation)
 | 
			
		||||
        self.assertEqual(fake_operation.description,
 | 
			
		||||
                         resp['result'].description)
 | 
			
		||||
        self.assertEqual(fake_operation.project_id, resp['result'].project_id)
 | 
			
		||||
        self.assertEqual(fake_operation.uuid, resp['result'].uuid)
 | 
			
		||||
        hand_get.assert_called_with('test_id')
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -33,9 +33,15 @@ class TestPlanController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_plan_get(self, PlanHandler, resp_mock, request_mock):
 | 
			
		||||
        hand_get = PlanHandler.return_value.get
 | 
			
		||||
        hand_get.return_value = fakes.FakePlan()
 | 
			
		||||
        fake_plan = fakes.FakePlan()
 | 
			
		||||
        hand_get.return_value = fake_plan
 | 
			
		||||
        cont = plan.PlanController('test_id')
 | 
			
		||||
        cont.get()
 | 
			
		||||
        resp = cont.get()
 | 
			
		||||
        self.assertIsNotNone(resp)
 | 
			
		||||
        self.assertEqual(fake_plan.name, resp['result'].name)
 | 
			
		||||
        self.assertEqual(fake_plan.project_id,
 | 
			
		||||
                         resp['result'].project_id)
 | 
			
		||||
        self.assertEqual(fake_plan.uuid, resp['result'].uuid)
 | 
			
		||||
        hand_get.assert_called_with('test_id')
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -75,9 +75,17 @@ class TestSensorController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_sensor_get(self, handler_mock, resp_mock, request_mock):
 | 
			
		||||
        handler_get = handler_mock.return_value.get
 | 
			
		||||
        handler_get.return_value = fakes.FakeSensor()
 | 
			
		||||
        fake_sensor = fakes.FakeSensor()
 | 
			
		||||
        handler_get.return_value = fake_sensor
 | 
			
		||||
        obj = controller.SensorController('test_id')
 | 
			
		||||
        result = obj.get()
 | 
			
		||||
        self.assertIsNotNone(result)
 | 
			
		||||
        self.assertEqual(fake_sensor.name, result['result'].name)
 | 
			
		||||
        self.assertEqual(fake_sensor.documentation,
 | 
			
		||||
                         result['result'].documentation)
 | 
			
		||||
        self.assertEqual(fake_sensor.description, result['result'].description)
 | 
			
		||||
        self.assertEqual(fake_sensor.project_id, result['result'].project_id)
 | 
			
		||||
        self.assertEqual(fake_sensor.uuid, result['result'].uuid)
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
        self.assertIsNotNone(result)
 | 
			
		||||
        handler_get.assert_called_once_with('test_id')
 | 
			
		||||
 
 | 
			
		||||
@@ -34,9 +34,16 @@ class TestServiceController(base.BaseTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_service_get(self, ServiceHandler, resp_mock, request_mock):
 | 
			
		||||
        hand_get = ServiceHandler.return_value.get
 | 
			
		||||
        hand_get.return_value = fakes.FakeService()
 | 
			
		||||
        fake_service = fakes.FakeService()
 | 
			
		||||
        hand_get.return_value = fake_service
 | 
			
		||||
        cont = service.ServiceController('test_id')
 | 
			
		||||
        cont.get()
 | 
			
		||||
        resp = cont.get()
 | 
			
		||||
        self.assertIsNotNone(resp)
 | 
			
		||||
        self.assertEqual(fake_service.name, resp['result'].name)
 | 
			
		||||
        self.assertEqual(fake_service.description,
 | 
			
		||||
                         resp['result'].description)
 | 
			
		||||
        self.assertEqual(fake_service.project_id, resp['result'].project_id)
 | 
			
		||||
        self.assertEqual(fake_service.uuid, resp['result'].uuid)
 | 
			
		||||
        hand_get.assert_called_with('test_id')
 | 
			
		||||
        self.assertEqual(200, resp_mock.status)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user