chore: make readability improvements in ADK BQ tool tests

PiperOrigin-RevId: 832110063

Author: google-genai-bot

tests/unittests/tools/bigquery/test_bigquery_client.py

@@ -19,7 +19,9 @@
 
 import google.adk
 from google.adk.tools.bigquery.client import get_bigquery_client
+import google.auth
 from google.auth.exceptions import DefaultCredentialsError
+from google.cloud.bigquery import client as bigquery_client
 from google.oauth2.credentials import Credentials
 
 
@@ -41,7 +43,9 @@ def test_bigquery_client_project_set_explicit():
   # Let's simulate that no environment variables are set, so that any project
   # set in there does not interfere with this test
   with mock.patch.dict(os.environ, {}, clear=True):
-    with mock.patch("google.auth.default", autospec=True) as mock_default_auth:
+    with mock.patch.object(
+        google.auth, "default", autospec=True
+    ) as mock_default_auth:
       # Simulate exception from default auth
       mock_default_auth.side_effect = DefaultCredentialsError(
           "Your default credentials were not found"
@@ -66,7 +70,9 @@ def test_bigquery_client_project_set_with_default_auth():
   # Let's simulate that no environment variables are set, so that any project
   # set in there does not interfere with this test
   with mock.patch.dict(os.environ, {}, clear=True):
-    with mock.patch("google.auth.default", autospec=True) as mock_default_auth:
+    with mock.patch.object(
+        google.auth, "default", autospec=True
+    ) as mock_default_auth:
       # Simulate credentials
       mock_creds = mock.create_autospec(Credentials, instance=True)
 
@@ -90,7 +96,9 @@ def test_bigquery_client_project_set_with_env():
   with mock.patch.dict(
       os.environ, {"GOOGLE_CLOUD_PROJECT": "test-gcp-project"}, clear=True
   ):
-    with mock.patch("google.auth.default", autospec=True) as mock_default_auth:
+    with mock.patch.object(
+        google.auth, "default", autospec=True
+    ) as mock_default_auth:
       # Simulate exception from default auth
       mock_default_auth.side_effect = DefaultCredentialsError(
           "Your default credentials were not found"
@@ -112,8 +120,8 @@ def test_bigquery_client_project_set_with_env():
 
 def test_bigquery_client_user_agent_default():
   """Test BigQuery client default user agent."""
-  with mock.patch(
-      "google.cloud.bigquery.client.Connection", autospec=True
+  with mock.patch.object(
+      bigquery_client, "Connection", autospec=True
   ) as mock_connection:
     # Trigger the BigQuery client creation
     get_bigquery_client(
@@ -134,8 +142,8 @@ def test_bigquery_client_user_agent_default():
 
 def test_bigquery_client_user_agent_custom():
   """Test BigQuery client custom user agent."""
-  with mock.patch(
-      "google.cloud.bigquery.client.Connection", autospec=True
+  with mock.patch.object(
+      bigquery_client, "Connection", autospec=True
   ) as mock_connection:
     # Trigger the BigQuery client creation
     get_bigquery_client(
@@ -158,8 +166,8 @@ def test_bigquery_client_user_agent_custom():
 
 def test_bigquery_client_user_agent_custom_list():
   """Test BigQuery client custom user agent."""
-  with mock.patch(
-      "google.cloud.bigquery.client.Connection", autospec=True
+  with mock.patch.object(
+      bigquery_client, "Connection", autospec=True
   ) as mock_connection:
     # Trigger the BigQuery client creation
     get_bigquery_client(

tests/unittests/tools/bigquery/test_bigquery_credentials.py

@@ -36,7 +36,6 @@ def test_valid_credentials_object_auth_credentials(self):
     to pass them directly without needing to provide client ID/secret.
     """
     # Create a mock auth credentials object
-    # auth_creds = google.auth.credentials.Credentials()
     auth_creds = mock.create_autospec(
         google.auth.credentials.Credentials, instance=True
     )

tests/unittests/tools/bigquery/test_bigquery_data_insights_tool.py

@@ -26,9 +26,7 @@
         pytest.param("test_data/ask_data_insights_penguins_highest_mass.yaml"),
     ],
 )
-@mock.patch(
-    "google.adk.tools.bigquery.data_insights_tool.requests.Session.post"
-)
+@mock.patch.object(data_insights_tool.requests.Session, "post")
 def test_ask_data_insights_pipeline_from_file(mock_post, case_file_path):
   """Runs a full integration test for the ask_data_insights pipeline using data from a specific file."""
   # 1. Construct the full, absolute path to the data file
@@ -65,7 +63,7 @@ def test_ask_data_insights_pipeline_from_file(mock_post, case_file_path):
   assert result == expected_final_list
 
 
-@mock.patch("google.adk.tools.bigquery.data_insights_tool._get_stream")
+@mock.patch.object(data_insights_tool, "_get_stream")
 def test_ask_data_insights_success(mock_get_stream):
   """Tests the success path of ask_data_insights using decorators."""
   # 1. Configure the behavior of the mocked functions
@@ -92,7 +90,7 @@ def test_ask_data_insights_success(mock_get_stream):
   mock_get_stream.assert_called_once()
 
 
-@mock.patch("google.adk.tools.bigquery.data_insights_tool._get_stream")
+@mock.patch.object(data_insights_tool, "_get_stream")
 def test_ask_data_insights_handles_exception(mock_get_stream):
   """Tests the exception path of ask_data_insights using decorators."""
   # 1. Configure one of the mocks to raise an error

tests/unittests/tools/bigquery/test_bigquery_metadata_tool.py

@@ -17,16 +17,18 @@
 import os
 from unittest import mock
 
+from google.adk.tools.bigquery import client as bq_client_lib
 from google.adk.tools.bigquery import metadata_tool
 from google.adk.tools.bigquery.config import BigQueryToolConfig
+import google.auth
 from google.auth.exceptions import DefaultCredentialsError
 from google.cloud import bigquery
 from google.oauth2.credentials import Credentials
 
 
 @mock.patch.dict(os.environ, {}, clear=True)
-@mock.patch("google.cloud.bigquery.Client.list_datasets", autospec=True)
-@mock.patch("google.auth.default", autospec=True)
+@mock.patch.object(bigquery.Client, "list_datasets", autospec=True)
+@mock.patch.object(google.auth, "default", autospec=True)
 def test_list_dataset_ids_no_default_auth(
     mock_default_auth, mock_list_datasets
 ):
@@ -53,8 +55,8 @@ def test_list_dataset_ids_no_default_auth(
 
 
 @mock.patch.dict(os.environ, {}, clear=True)
-@mock.patch("google.cloud.bigquery.Client.get_dataset", autospec=True)
-@mock.patch("google.auth.default", autospec=True)
+@mock.patch.object(bigquery.Client, "get_dataset", autospec=True)
+@mock.patch.object(google.auth, "default", autospec=True)
 def test_get_dataset_info_no_default_auth(mock_default_auth, mock_get_dataset):
   """Test get_dataset_info tool invocation involves no default auth."""
   mock_credentials = mock.create_autospec(Credentials, instance=True)
@@ -80,8 +82,8 @@ def test_get_dataset_info_no_default_auth(mock_default_auth, mock_get_dataset):
 
 
 @mock.patch.dict(os.environ, {}, clear=True)
-@mock.patch("google.cloud.bigquery.Client.list_tables", autospec=True)
-@mock.patch("google.auth.default", autospec=True)
+@mock.patch.object(bigquery.Client, "list_tables", autospec=True)
+@mock.patch.object(google.auth, "default", autospec=True)
 def test_list_table_ids_no_default_auth(mock_default_auth, mock_list_tables):
   """Test list_table_ids tool invocation involves no default auth."""
   project = "my_project_id"
@@ -108,8 +110,8 @@ def test_list_table_ids_no_default_auth(mock_default_auth, mock_list_tables):
 
 
 @mock.patch.dict(os.environ, {}, clear=True)
-@mock.patch("google.cloud.bigquery.Client.get_table", autospec=True)
-@mock.patch("google.auth.default", autospec=True)
+@mock.patch.object(bigquery.Client, "get_table", autospec=True)
+@mock.patch.object(google.auth, "default", autospec=True)
 def test_get_table_info_no_default_auth(mock_default_auth, mock_get_table):
   """Test get_table_info tool invocation involves no default auth."""
   mock_credentials = mock.create_autospec(Credentials, instance=True)
@@ -137,8 +139,8 @@ def test_get_table_info_no_default_auth(mock_default_auth, mock_get_table):
 
 
 @mock.patch.dict(os.environ, {}, clear=True)
-@mock.patch("google.cloud.bigquery.Client.get_job", autospec=True)
-@mock.patch("google.auth.default", autospec=True)
+@mock.patch.object(bigquery.Client, "get_job", autospec=True)
+@mock.patch.object(google.auth, "default", autospec=True)
 def test_get_job_info_no_default_auth(mock_default_auth, mock_get_job):
   """Test get_job_info tool invocation involves no default auth."""
   mock_credentials = mock.create_autospec(Credentials, instance=True)
@@ -166,9 +168,7 @@ def test_get_job_info_no_default_auth(mock_default_auth, mock_get_job):
   mock_default_auth.assert_not_called()
 
 
-@mock.patch(
-    "google.adk.tools.bigquery.client.get_bigquery_client", autospec=True
-)
+@mock.patch.object(bq_client_lib, "get_bigquery_client", autospec=True)
 def test_list_dataset_ids_bq_client_creation(mock_get_bigquery_client):
   """Test BigQuery client creation params during list_dataset_ids tool invocation."""
   bq_project = "my_project_id"
@@ -189,9 +189,7 @@ def test_list_dataset_ids_bq_client_creation(mock_get_bigquery_client):
   ]
 
 
-@mock.patch(
-    "google.adk.tools.bigquery.client.get_bigquery_client", autospec=True
-)
+@mock.patch.object(bq_client_lib, "get_bigquery_client", autospec=True)
 def test_get_dataset_info_bq_client_creation(mock_get_bigquery_client):
   """Test BigQuery client creation params during get_dataset_info tool invocation."""
   bq_project = "my_project_id"
@@ -215,9 +213,7 @@ def test_get_dataset_info_bq_client_creation(mock_get_bigquery_client):
   ]
 
 
-@mock.patch(
-    "google.adk.tools.bigquery.client.get_bigquery_client", autospec=True
-)
+@mock.patch.object(bq_client_lib, "get_bigquery_client", autospec=True)
 def test_list_table_ids_bq_client_creation(mock_get_bigquery_client):
   """Test BigQuery client creation params during list_table_ids tool invocation."""
   bq_project = "my_project_id"
@@ -241,9 +237,7 @@ def test_list_table_ids_bq_client_creation(mock_get_bigquery_client):
   ]
 
 
-@mock.patch(
-    "google.adk.tools.bigquery.client.get_bigquery_client", autospec=True
-)
+@mock.patch.object(bq_client_lib, "get_bigquery_client", autospec=True)
 def test_get_table_info_bq_client_creation(mock_get_bigquery_client):
   """Test BigQuery client creation params during get_table_info tool invocation."""
   bq_project = "my_project_id"
@@ -268,9 +262,7 @@ def test_get_table_info_bq_client_creation(mock_get_bigquery_client):
   ]
 
 
-@mock.patch(
-    "google.adk.tools.bigquery.client.get_bigquery_client", autospec=True
-)
+@mock.patch.object(bq_client_lib, "get_bigquery_client", autospec=True)
 def test_get_job_info_bq_client_creation(mock_get_bigquery_client):
   """Test BigQuery client creation params during get_table_info tool invocation."""
   bq_project = "my_project_id"