refactor more tests

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

tests/HPECP-REST-API-SOAPUI.xml renamed to tests/_HPECP-REST-API-SOAPUI.xml

@@ -0,0 +1,43 @@
+# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+
+from .base_test import BaseTestCase, MockResponse
+
+
+def mockApiSetup():
+
+    BaseTestCase.registerHttpGetHandler(
+        url="https://127.0.0.1:8080/api/v1/role/1",
+        response=MockResponse(
+            json_data={
+                "_links": {
+                    "self": {"href": "/api/v1/role/1"},
+                    "all_roles": {"href": "/api/v1/role"},
+                },
+                "label": {
+                    "name": "Site Admin",
+                    "description": "Role for Site Admin",
+                },
+            },
+            status_code=200,
+            headers={},
+        ),
+    )

tests/role_mock_api_responses.py

@@ -33,37 +33,15 @@
     get_client,
     session_mock_response,
 )
+from .role_mock_api_responses import mockApiSetup
 
-
-# pylint: disable=no-method-argument
-def mocked_requests_get(*args, **kwargs):
-    if args[0] == "https://127.0.0.1:8080/api/v1/role/1":
-        return MockResponse(
-            json_data={
-                "_links": {
-                    "self": {"href": "/api/v1/role/1"},
-                    "all_roles": {"href": "/api/v1/role"},
-                },
-                "label": {
-                    "name": "Site Admin",
-                    "description": "Role for Site Admin",
-                },
-            },
-            status_code=200,
-            headers={},
-        )
-    raise RuntimeError("Unhandle GET request: " + args[0])
-
-
-def mocked_requests_post(*args, **kwargs):
-    if args[0] == "https://127.0.0.1:8080/api/v1/login":
-        return session_mock_response()
-    raise RuntimeError("Unhandle POST request: " + args[0])
+# setup the mock data
+mockApiSetup()
 
 
 class TestRoleGet(TestCase):
-    @patch("requests.get", side_effect=mocked_requests_get)
-    @patch("requests.post", side_effect=mocked_requests_post)
+    @patch("requests.get", side_effect=BaseTestCase.httpGetHandlers)
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_get_role_assertions(self, mock_get, mock_post):
 
         with self.assertRaisesRegexp(
@@ -77,8 +55,8 @@ def test_get_role_assertions(self, mock_get, mock_post):
         ):
             get_client().role.get("garbage")
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    @patch("requests.post", side_effect=mocked_requests_post)
+    @patch("requests.get", side_effect=BaseTestCase.httpGetHandlers)
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_get_role(self, mock_get, mock_post):
 
         role = get_client().role.get("/api/v1/role/1")
@@ -89,8 +67,8 @@ def test_get_role(self, mock_get, mock_post):
 
 
 class TestCLI(BaseTestCase):
-    @patch("requests.get", side_effect=mocked_requests_get)
-    @patch("requests.post", side_effect=mocked_requests_post)
+    @patch("requests.get", side_effect=BaseTestCase.httpGetHandlers)
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_get(self, mock_post, mock_delete):
 
         try:
@@ -121,8 +99,8 @@ def test_get(self, mock_post, mock_delete):
         if six.PY2:
             self.assertEqual(stderr, expected_stderr)
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    @patch("requests.post", side_effect=mocked_requests_post)
+    @patch("requests.get", side_effect=BaseTestCase.httpGetHandlers)
+    @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
     def test_get_json(self, mock_post, mock_delete):
 
         try: