refactor: use 'Client._get_path' in 'HMACKeyMetadata.reload'

tseaver · tseaver · commit 3942d752b097 · 2021-05-06T16:20:33.000-04:00
Toward #38.
diff --git a/google/cloud/storage/hmac_key.py b/google/cloud/storage/hmac_key.py
@@ -262,12 +262,8 @@ def reload(self, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
         if self.user_project is not None:
             qs_params["userProject"] = self.user_project
 
-        self._properties = self._client._connection.api_request(
-            method="GET",
-            path=self.path,
-            query_params=qs_params,
-            timeout=timeout,
-            retry=retry,
+        self._properties = self._client._get_path(
+            self.path, query_params=qs_params, timeout=timeout, retry=retry,
         )
 
     def update(self, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY_IF_ETAG_IN_JSON):
diff --git a/tests/unit/test_hmac_key.py b/tests/unit/test_hmac_key.py
@@ -269,30 +269,28 @@ def test_exists_hit_w_user_project_w_timeout_w_retry(self):
             retry=retry,
         )
 
-    def test_reload_miss_no_project_set(self):
+    def test_reload_miss_w_defaults(self):
         from google.cloud.exceptions import NotFound
 
         access_id = "ACCESS-ID"
-        connection = mock.Mock(spec=["api_request"])
-        connection.api_request.side_effect = NotFound("testing")
-        client = _Client(connection)
+        project = "PROJECT"
+        client = mock.Mock(spec=["_get_path", "project"])
+        client._get_path.side_effect = NotFound("testing")
+        client.project = project
         metadata = self._make_one(client)
         metadata._properties["accessId"] = access_id
 
         with self.assertRaises(NotFound):
-            metadata.reload(timeout=42)
+            metadata.reload()
 
-        expected_path = "/projects/{}/hmacKeys/{}".format(
-            client.DEFAULT_PROJECT, access_id
+        expected_path = "/projects/{}/hmacKeys/{}".format(project, access_id)
+        expected_query_params = {}
+        client._get_path.assert_called_once_with(
+            expected_path,
+            query_params=expected_query_params,
+            timeout=self._get_default_timeout(),
+            retry=DEFAULT_RETRY,
         )
-        expected_kwargs = {
-            "method": "GET",
-            "path": expected_path,
-            "query_params": {},
-            "timeout": 42,
-            "retry": DEFAULT_RETRY,
-        }
-        connection.api_request.assert_called_once_with(**expected_kwargs)
 
     def test_reload_hit_w_project_set(self):
         project = "PROJECT-ID"
@@ -304,26 +302,26 @@ def test_reload_hit_w_project_set(self):
             "accessId": access_id,
             "serviceAccountEmail": email,
         }
-        connection = mock.Mock(spec=["api_request"])
-        connection.api_request.return_value = resource
-        client = _Client(connection)
+        timeout = 42
+        retry = mock.Mock(spec=[])
+        client = mock.Mock(spec=["_get_path"])
+        client._get_path.return_value = resource
         metadata = self._make_one(client, user_project=user_project)
         metadata._properties["accessId"] = access_id
         metadata._properties["projectId"] = project
 
-        metadata.reload()
+        metadata.reload(timeout=timeout, retry=retry)
 
         self.assertEqual(metadata._properties, resource)
 
         expected_path = "/projects/{}/hmacKeys/{}".format(project, access_id)
-        expected_kwargs = {
-            "method": "GET",
-            "path": expected_path,
-            "query_params": {"userProject": user_project},
-            "timeout": self._get_default_timeout(),
-            "retry": DEFAULT_RETRY,
-        }
-        connection.api_request.assert_called_once_with(**expected_kwargs)
+        expected_query_params = {"userProject": user_project}
+        client._get_path.assert_called_once_with(
+            expected_path,
+            query_params=expected_query_params,
+            timeout=timeout,
+            retry=retry,
+        )
 
     def test_update_miss_no_project_set(self):
         from google.cloud.exceptions import NotFound
