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

tseaver · tseaver · commit 2103462d4e01 · 2021-05-06T16:58:22.000-04:00
Toward #38.
diff --git a/google/cloud/storage/notification.py b/google/cloud/storage/notification.py
@@ -377,12 +377,8 @@ def reload(self, client=None, timeout=_DEFAULT_TIMEOUT, retry=DEFAULT_RETRY):
         if self.bucket.user_project is not None:
             query_params["userProject"] = self.bucket.user_project
 
-        response = client._connection.api_request(
-            method="GET",
-            path=self.path,
-            query_params=query_params,
-            timeout=timeout,
-            retry=retry,
+        response = client._get_path(
+            self.path, query_params=query_params, timeout=timeout, retry=retry,
         )
         self._set_properties(response)
 
diff --git a/tests/unit/test_notification.py b/tests/unit/test_notification.py
@@ -387,52 +387,58 @@ def test_exists_hit_w_explicit_w_user_project(self):
         )
 
     def test_reload_wo_notification_id(self):
-        client = self._make_client()
+        client = mock.Mock(spec=["_get_path", "project"])
+        client.project = self.BUCKET_PROJECT
         bucket = self._make_bucket(client)
         notification = self._make_one(bucket, self.TOPIC_NAME)
 
         with self.assertRaises(ValueError):
             notification.reload()
 
-    def test_reload_miss(self):
+        client._get_path.assert_not_called()
+
+    def test_reload_miss_w_defaults(self):
         from google.cloud.exceptions import NotFound
 
-        client = self._make_client()
+        client = mock.Mock(spec=["_get_path", "project"])
+        client._get_path.side_effect = NotFound("testing")
+        client.project = self.BUCKET_PROJECT
         bucket = self._make_bucket(client)
         notification = self._make_one(bucket, self.TOPIC_NAME)
         notification._properties["id"] = self.NOTIFICATION_ID
-        api_request = client._connection.api_request
-        api_request.side_effect = NotFound("testing")
 
         with self.assertRaises(NotFound):
-            notification.reload(timeout=42)
+            notification.reload()
 
-        api_request.assert_called_once_with(
-            method="GET",
-            path=self.NOTIFICATION_PATH,
-            query_params={},
-            timeout=42,
+        expected_query_params = {}
+        client._get_path.assert_called_once_with(
+            self.NOTIFICATION_PATH,
+            query_params=expected_query_params,
+            timeout=self._get_default_timeout(),
             retry=DEFAULT_RETRY,
         )
 
-    def test_reload_hit(self):
+    def test_reload_hit_w_explicit_w_user_project(self):
         from google.cloud.storage.notification import NONE_PAYLOAD_FORMAT
 
-        USER_PROJECT = "user-project-123"
-        client = self._make_client()
-        bucket = self._make_bucket(client, user_project=USER_PROJECT)
-        notification = self._make_one(bucket, self.TOPIC_NAME)
-        notification._properties["id"] = self.NOTIFICATION_ID
-        api_request = client._connection.api_request
-        api_request.return_value = {
+        user_project = "user-project-123"
+        api_response = {
             "topic": self.TOPIC_REF,
             "id": self.NOTIFICATION_ID,
             "etag": self.ETAG,
             "selfLink": self.SELF_LINK,
             "payload_format": NONE_PAYLOAD_FORMAT,
         }
+        client = mock.Mock(spec=["_get_path", "project"])
+        client._get_path.return_value = api_response
+        client.project = self.BUCKET_PROJECT
+        bucket = self._make_bucket(client, user_project=user_project)
+        notification = self._make_one(bucket, self.TOPIC_NAME)
+        notification._properties["id"] = self.NOTIFICATION_ID
+        timeout = 42
+        retry = mock.Mock(spec=[])
 
-        notification.reload(client=client)
+        notification.reload(client=client, timeout=timeout, retry=retry)
 
         self.assertEqual(notification.etag, self.ETAG)
         self.assertEqual(notification.self_link, self.SELF_LINK)
@@ -441,12 +447,12 @@ def test_reload_hit(self):
         self.assertIsNone(notification.blob_name_prefix)
         self.assertEqual(notification.payload_format, NONE_PAYLOAD_FORMAT)
 
-        api_request.assert_called_once_with(
-            method="GET",
-            path=self.NOTIFICATION_PATH,
-            query_params={"userProject": USER_PROJECT},
-            timeout=self._get_default_timeout(),
-            retry=DEFAULT_RETRY,
+        expected_query_params = {"userProject": user_project}
+        client._get_path.assert_called_once_with(
+            self.NOTIFICATION_PATH,
+            query_params=expected_query_params,
+            timeout=timeout,
+            retry=retry,
         )
 
     def test_delete_wo_notification_id(self):
