Refactor codes for subscriptions

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / tests / test_subscribe_notification.py

diff --git a/lcm/lcm/nf/tests/test_subscribe_notification.py b/lcm/lcm/nf/tests/test_subscribe_notification.py
index 63d7bc2..73463ef 100644 (file)
--- a/lcm/lcm/nf/tests/test_subscribe_notification.py
+++ b/lcm/lcm/nf/tests/test_subscribe_notification.py
@@ -36,6 +36,7 @@ class TestSubscription(TestCase):
         mock_requests.get.status_code = 204
         mock_uuid4.return_value = temp_uuid
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
+        self.assertEqual(201, response.status_code)
         self.assertEqual(dummy_subscription["callbackUri"], response.data["callbackUri"])
         self.assertEqual(temp_uuid, response.data["id"])
 
@@ -66,6 +67,7 @@ class TestSubscription(TestCase):
         mock_requests.get.return_value.status_code = 204
         mock_uuid4.return_value = temp_uuid
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
+        self.assertEqual(201, response.status_code)
         self.assertEqual(dummy_subscription["callbackUri"], response.data["callbackUri"])
         self.assertEqual(temp_uuid, response.data["id"])
 
@@ -93,9 +95,11 @@ class TestSubscription(TestCase):
         mock_requests.return_value.status_code = 204
         mock_requests.get.return_value.status_code = 204
         expected_data = {
-            'error': 'Auth type should be BASIC'
+            'detail': 'Auth type should be BASIC',
+            'status': 500
         }
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
+        self.assertEqual(500, response.status_code)
         self.assertEqual(expected_data, response.data)
 
     @mock.patch("requests.get")
@@ -115,10 +119,12 @@ class TestSubscription(TestCase):
         mock_requests.return_value.status_code = 204
         mock_requests.get.return_value.status_code = 204
         expected_data = {
-            'error': 'If you are setting operationTypes,then ' +
-            'notificationTypes must be VnfLcmOperationOccurrenceNotification'
+            'detail': 'If you are setting operationTypes,then ' +
+            'notificationTypes must be VnfLcmOperationOccurrenceNotification',
+            'status': 500
         }
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
+        self.assertEqual(500, response.status_code)
         self.assertEqual(expected_data, response.data)
 
     @mock.patch("requests.get")
@@ -141,11 +147,8 @@ class TestSubscription(TestCase):
         mock_requests.get.return_value.status_code = 204
         mock_uuid4.return_value = temp_uuid
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
+        self.assertEqual(201, response.status_code)
         self.assertEqual(dummy_subscription["callbackUri"], response.data["callbackUri"])
         self.assertEqual(temp_uuid, response.data["id"])
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
         self.assertEqual(303, response.status_code)
-        expected_data = {
-            "error": "Already Subscription exists with the same callbackUri and filter"
-        }
-        self.assertEqual(expected_data, response.data)