From 50c0aa4c076a35d5cb608cbfc9295579df3d07e9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 13:55:19 -0500 Subject: [PATCH] chore: use gapic-generator-python 0.58.4 (#275) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: use gapic-generator-python 0.58.4 fix: provide appropriate mock values for message body fields committer: dovs PiperOrigin-RevId: 419025932 Source-Link: https://github.com/googleapis/googleapis/commit/73da6697f598f1ba30618924936a59f8e457ec89 Source-Link: https://github.com/googleapis/googleapis-gen/commit/46df624a54b9ed47c1a7eefb7a49413cf7b82f98 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .../services/data_catalog/transports/base.py | 1 - .../policy_tag_manager/transports/base.py | 1 - .../transports/base.py | 1 - .../services/data_catalog/transports/base.py | 1 - .../policy_tag_manager/transports/base.py | 1 - .../transports/base.py | 1 - .../gapic/datacatalog_v1/test_data_catalog.py | 317 ++++++------------ .../datacatalog_v1/test_policy_tag_manager.py | 173 ++++------ .../test_policy_tag_manager_serialization.py | 50 ++- .../datacatalog_v1beta1/test_data_catalog.py | 305 ++++++----------- .../test_policy_tag_manager.py | 173 ++++------ .../test_policy_tag_manager_serialization.py | 38 +-- 12 files changed, 378 insertions(+), 684 deletions(-) diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py index 7c107b268b3a..fe2ae7128689 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/data_catalog/transports/base.py @@ -105,7 +105,6 @@ def __init__( credentials, _ = google.auth.load_credentials_from_file( credentials_file, **scopes_kwargs, quota_project_id=quota_project_id ) - elif credentials is None: credentials, _ = google.auth.default( **scopes_kwargs, quota_project_id=quota_project_id diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py index 9030003ea073..214fa198332c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager/transports/base.py @@ -104,7 +104,6 @@ def __init__( credentials, _ = google.auth.load_credentials_from_file( credentials_file, **scopes_kwargs, quota_project_id=quota_project_id ) - elif credentials is None: credentials, _ = google.auth.default( **scopes_kwargs, quota_project_id=quota_project_id diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py index d09c1c92d01b..8bcad273ed2c 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1/services/policy_tag_manager_serialization/transports/base.py @@ -102,7 +102,6 @@ def __init__( credentials, _ = google.auth.load_credentials_from_file( credentials_file, **scopes_kwargs, quota_project_id=quota_project_id ) - elif credentials is None: credentials, _ = google.auth.default( **scopes_kwargs, quota_project_id=quota_project_id diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py index 0d872024de98..3b50847c988b 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/data_catalog/transports/base.py @@ -105,7 +105,6 @@ def __init__( credentials, _ = google.auth.load_credentials_from_file( credentials_file, **scopes_kwargs, quota_project_id=quota_project_id ) - elif credentials is None: credentials, _ = google.auth.default( **scopes_kwargs, quota_project_id=quota_project_id diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py index 51aff4d85f0b..574252dee8ea 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager/transports/base.py @@ -104,7 +104,6 @@ def __init__( credentials, _ = google.auth.load_credentials_from_file( credentials_file, **scopes_kwargs, quota_project_id=quota_project_id ) - elif credentials is None: credentials, _ = google.auth.default( **scopes_kwargs, quota_project_id=quota_project_id diff --git a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py index 5f9dc9ec585f..a571a1882203 100644 --- a/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py +++ b/packages/google-cloud-datacatalog/google/cloud/datacatalog_v1beta1/services/policy_tag_manager_serialization/transports/base.py @@ -101,7 +101,6 @@ def __init__( credentials, _ = google.auth.load_credentials_from_file( credentials_file, **scopes_kwargs, quota_project_id=quota_project_id ) - elif credentials is None: credentials, _ = google.auth.default( **scopes_kwargs, quota_project_id=quota_project_id diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py index 88f21501d576..01685290a098 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_data_catalog.py @@ -253,20 +253,20 @@ def test_data_catalog_client_client_options( # unsupported value. with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}): with pytest.raises(MutualTLSChannelError): - client = client_class() + client = client_class(transport=transport_name) # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value. with mock.patch.dict( os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"} ): with pytest.raises(ValueError): - client = client_class() + client = client_class(transport=transport_name) # Check the case quota_project_id is provided options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -323,7 +323,7 @@ def test_data_catalog_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) if use_client_cert_env == "false": expected_client_cert_source = None @@ -418,7 +418,7 @@ def test_data_catalog_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -449,7 +449,7 @@ def test_data_catalog_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -480,9 +480,8 @@ def test_data_catalog_client_client_options_from_dict(): ) -def test_search_catalog( - transport: str = "grpc", request_type=datacatalog.SearchCatalogRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.SearchCatalogRequest, dict,]) +def test_search_catalog(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -510,10 +509,6 @@ def test_search_catalog( assert response.unreachable == ["unreachable_value"] -def test_search_catalog_from_dict(): - test_search_catalog(request_type=dict) - - def test_search_catalog_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -664,8 +659,10 @@ async def test_search_catalog_flattened_error_async(): ) -def test_search_catalog_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_search_catalog_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.search_catalog), "__call__") as call: @@ -699,8 +696,10 @@ def test_search_catalog_pager(): assert all(isinstance(i, search.SearchCatalogResult) for i in results) -def test_search_catalog_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_search_catalog_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.search_catalog), "__call__") as call: @@ -799,9 +798,8 @@ async def test_search_catalog_async_pages(): assert page_.raw_page.next_page_token == token -def test_create_entry_group( - transport: str = "grpc", request_type=datacatalog.CreateEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.CreateEntryGroupRequest, dict,]) +def test_create_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -834,10 +832,6 @@ def test_create_entry_group( assert response.description == "description_value" -def test_create_entry_group_from_dict(): - test_create_entry_group(request_type=dict) - - def test_create_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1051,9 +1045,8 @@ async def test_create_entry_group_flattened_error_async(): ) -def test_get_entry_group( - transport: str = "grpc", request_type=datacatalog.GetEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.GetEntryGroupRequest, dict,]) +def test_get_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1084,10 +1077,6 @@ def test_get_entry_group( assert response.description == "description_value" -def test_get_entry_group_from_dict(): - test_get_entry_group(request_type=dict) - - def test_get_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1279,9 +1268,8 @@ async def test_get_entry_group_flattened_error_async(): ) -def test_update_entry_group( - transport: str = "grpc", request_type=datacatalog.UpdateEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateEntryGroupRequest, dict,]) +def test_update_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1314,10 +1302,6 @@ def test_update_entry_group( assert response.description == "description_value" -def test_update_entry_group_from_dict(): - test_update_entry_group(request_type=dict) - - def test_update_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1525,9 +1509,8 @@ async def test_update_entry_group_flattened_error_async(): ) -def test_delete_entry_group( - transport: str = "grpc", request_type=datacatalog.DeleteEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteEntryGroupRequest, dict,]) +def test_delete_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1553,10 +1536,6 @@ def test_delete_entry_group( assert response is None -def test_delete_entry_group_from_dict(): - test_delete_entry_group(request_type=dict) - - def test_delete_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1731,9 +1710,8 @@ async def test_delete_entry_group_flattened_error_async(): ) -def test_list_entry_groups( - transport: str = "grpc", request_type=datacatalog.ListEntryGroupsRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.ListEntryGroupsRequest, dict,]) +def test_list_entry_groups(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1762,10 +1740,6 @@ def test_list_entry_groups( assert response.next_page_token == "next_page_token_value" -def test_list_entry_groups_from_dict(): - test_list_entry_groups(request_type=dict) - - def test_list_entry_groups_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1949,8 +1923,10 @@ async def test_list_entry_groups_flattened_error_async(): ) -def test_list_entry_groups_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entry_groups_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1991,8 +1967,10 @@ def test_list_entry_groups_pager(): assert all(isinstance(i, datacatalog.EntryGroup) for i in results) -def test_list_entry_groups_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entry_groups_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2103,9 +2081,8 @@ async def test_list_entry_groups_async_pages(): assert page_.raw_page.next_page_token == token -def test_create_entry( - transport: str = "grpc", request_type=datacatalog.CreateEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.CreateEntryRequest, dict,]) +def test_create_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2148,10 +2125,6 @@ def test_create_entry( assert response.description == "description_value" -def test_create_entry_from_dict(): - test_create_entry(request_type=dict) - - def test_create_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2353,9 +2326,8 @@ async def test_create_entry_flattened_error_async(): ) -def test_update_entry( - transport: str = "grpc", request_type=datacatalog.UpdateEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateEntryRequest, dict,]) +def test_update_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2398,10 +2370,6 @@ def test_update_entry( assert response.description == "description_value" -def test_update_entry_from_dict(): - test_update_entry(request_type=dict) - - def test_update_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2593,9 +2561,8 @@ async def test_update_entry_flattened_error_async(): ) -def test_delete_entry( - transport: str = "grpc", request_type=datacatalog.DeleteEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteEntryRequest, dict,]) +def test_delete_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2619,10 +2586,6 @@ def test_delete_entry( assert response is None -def test_delete_entry_from_dict(): - test_delete_entry(request_type=dict) - - def test_delete_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2785,7 +2748,8 @@ async def test_delete_entry_flattened_error_async(): ) -def test_get_entry(transport: str = "grpc", request_type=datacatalog.GetEntryRequest): +@pytest.mark.parametrize("request_type", [datacatalog.GetEntryRequest, dict,]) +def test_get_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2828,10 +2792,6 @@ def test_get_entry(transport: str = "grpc", request_type=datacatalog.GetEntryReq assert response.description == "description_value" -def test_get_entry_from_dict(): - test_get_entry(request_type=dict) - - def test_get_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3007,9 +2967,8 @@ async def test_get_entry_flattened_error_async(): ) -def test_lookup_entry( - transport: str = "grpc", request_type=datacatalog.LookupEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.LookupEntryRequest, dict,]) +def test_lookup_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3052,10 +3011,6 @@ def test_lookup_entry( assert response.description == "description_value" -def test_lookup_entry_from_dict(): - test_lookup_entry(request_type=dict) - - def test_lookup_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3116,9 +3071,8 @@ async def test_lookup_entry_async_from_dict(): await test_lookup_entry_async(request_type=dict) -def test_list_entries( - transport: str = "grpc", request_type=datacatalog.ListEntriesRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.ListEntriesRequest, dict,]) +def test_list_entries(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3145,10 +3099,6 @@ def test_list_entries( assert response.next_page_token == "next_page_token_value" -def test_list_entries_from_dict(): - test_list_entries(request_type=dict) - - def test_list_entries_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3318,8 +3268,10 @@ async def test_list_entries_flattened_error_async(): ) -def test_list_entries_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entries_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_entries), "__call__") as call: @@ -3356,8 +3308,10 @@ def test_list_entries_pager(): assert all(isinstance(i, datacatalog.Entry) for i in results) -def test_list_entries_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entries_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_entries), "__call__") as call: @@ -3456,9 +3410,8 @@ async def test_list_entries_async_pages(): assert page_.raw_page.next_page_token == token -def test_create_tag_template( - transport: str = "grpc", request_type=datacatalog.CreateTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.CreateTagTemplateRequest, dict,]) +def test_create_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3491,10 +3444,6 @@ def test_create_tag_template( assert response.is_publicly_readable is True -def test_create_tag_template_from_dict(): - test_create_tag_template(request_type=dict) - - def test_create_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3704,9 +3653,8 @@ async def test_create_tag_template_flattened_error_async(): ) -def test_get_tag_template( - transport: str = "grpc", request_type=datacatalog.GetTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.GetTagTemplateRequest, dict,]) +def test_get_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3737,10 +3685,6 @@ def test_get_tag_template( assert response.is_publicly_readable is True -def test_get_tag_template_from_dict(): - test_get_tag_template(request_type=dict) - - def test_get_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3912,9 +3856,8 @@ async def test_get_tag_template_flattened_error_async(): ) -def test_update_tag_template( - transport: str = "grpc", request_type=datacatalog.UpdateTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateTagTemplateRequest, dict,]) +def test_update_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3947,10 +3890,6 @@ def test_update_tag_template( assert response.is_publicly_readable is True -def test_update_tag_template_from_dict(): - test_update_tag_template(request_type=dict) - - def test_update_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4156,9 +4095,8 @@ async def test_update_tag_template_flattened_error_async(): ) -def test_delete_tag_template( - transport: str = "grpc", request_type=datacatalog.DeleteTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteTagTemplateRequest, dict,]) +def test_delete_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4184,10 +4122,6 @@ def test_delete_tag_template( assert response is None -def test_delete_tag_template_from_dict(): - test_delete_tag_template(request_type=dict) - - def test_delete_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4370,9 +4304,10 @@ async def test_delete_tag_template_flattened_error_async(): ) -def test_create_tag_template_field( - transport: str = "grpc", request_type=datacatalog.CreateTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.CreateTagTemplateFieldRequest, dict,] +) +def test_create_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4409,10 +4344,6 @@ def test_create_tag_template_field( assert response.order == 540 -def test_create_tag_template_field_from_dict(): - test_create_tag_template_field(request_type=dict) - - def test_create_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4631,9 +4562,10 @@ async def test_create_tag_template_field_flattened_error_async(): ) -def test_update_tag_template_field( - transport: str = "grpc", request_type=datacatalog.UpdateTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.UpdateTagTemplateFieldRequest, dict,] +) +def test_update_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4670,10 +4602,6 @@ def test_update_tag_template_field( assert response.order == 540 -def test_update_tag_template_field_from_dict(): - test_update_tag_template_field(request_type=dict) - - def test_update_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4892,9 +4820,10 @@ async def test_update_tag_template_field_flattened_error_async(): ) -def test_rename_tag_template_field( - transport: str = "grpc", request_type=datacatalog.RenameTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.RenameTagTemplateFieldRequest, dict,] +) +def test_rename_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4931,10 +4860,6 @@ def test_rename_tag_template_field( assert response.order == 540 -def test_rename_tag_template_field_from_dict(): - test_rename_tag_template_field(request_type=dict) - - def test_rename_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5143,10 +5068,10 @@ async def test_rename_tag_template_field_flattened_error_async(): ) -def test_rename_tag_template_field_enum_value( - transport: str = "grpc", - request_type=datacatalog.RenameTagTemplateFieldEnumValueRequest, -): +@pytest.mark.parametrize( + "request_type", [datacatalog.RenameTagTemplateFieldEnumValueRequest, dict,] +) +def test_rename_tag_template_field_enum_value(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5183,10 +5108,6 @@ def test_rename_tag_template_field_enum_value( assert response.order == 540 -def test_rename_tag_template_field_enum_value_from_dict(): - test_rename_tag_template_field_enum_value(request_type=dict) - - def test_rename_tag_template_field_enum_value_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5395,9 +5316,10 @@ async def test_rename_tag_template_field_enum_value_flattened_error_async(): ) -def test_delete_tag_template_field( - transport: str = "grpc", request_type=datacatalog.DeleteTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.DeleteTagTemplateFieldRequest, dict,] +) +def test_delete_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5423,10 +5345,6 @@ def test_delete_tag_template_field( assert response is None -def test_delete_tag_template_field_from_dict(): - test_delete_tag_template_field(request_type=dict) - - def test_delete_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5612,7 +5530,8 @@ async def test_delete_tag_template_field_flattened_error_async(): ) -def test_create_tag(transport: str = "grpc", request_type=datacatalog.CreateTagRequest): +@pytest.mark.parametrize("request_type", [datacatalog.CreateTagRequest, dict,]) +def test_create_tag(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5644,10 +5563,6 @@ def test_create_tag(transport: str = "grpc", request_type=datacatalog.CreateTagR assert response.template_display_name == "template_display_name_value" -def test_create_tag_from_dict(): - test_create_tag(request_type=dict) - - def test_create_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5833,7 +5748,8 @@ async def test_create_tag_flattened_error_async(): ) -def test_update_tag(transport: str = "grpc", request_type=datacatalog.UpdateTagRequest): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateTagRequest, dict,]) +def test_update_tag(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5865,10 +5781,6 @@ def test_update_tag(transport: str = "grpc", request_type=datacatalog.UpdateTagR assert response.template_display_name == "template_display_name_value" -def test_update_tag_from_dict(): - test_update_tag(request_type=dict) - - def test_update_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6056,7 +5968,8 @@ async def test_update_tag_flattened_error_async(): ) -def test_delete_tag(transport: str = "grpc", request_type=datacatalog.DeleteTagRequest): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteTagRequest, dict,]) +def test_delete_tag(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6080,10 +5993,6 @@ def test_delete_tag(transport: str = "grpc", request_type=datacatalog.DeleteTagR assert response is None -def test_delete_tag_from_dict(): - test_delete_tag(request_type=dict) - - def test_delete_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6246,7 +6155,8 @@ async def test_delete_tag_flattened_error_async(): ) -def test_list_tags(transport: str = "grpc", request_type=datacatalog.ListTagsRequest): +@pytest.mark.parametrize("request_type", [datacatalog.ListTagsRequest, dict,]) +def test_list_tags(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6273,10 +6183,6 @@ def test_list_tags(transport: str = "grpc", request_type=datacatalog.ListTagsReq assert response.next_page_token == "next_page_token_value" -def test_list_tags_from_dict(): - test_list_tags(request_type=dict) - - def test_list_tags_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6446,8 +6352,10 @@ async def test_list_tags_flattened_error_async(): ) -def test_list_tags_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_tags_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_tags), "__call__") as call: @@ -6475,8 +6383,10 @@ def test_list_tags_pager(): assert all(isinstance(i, tags.Tag) for i in results) -def test_list_tags_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_tags_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_tags), "__call__") as call: @@ -6548,9 +6458,8 @@ async def test_list_tags_async_pages(): assert page_.raw_page.next_page_token == token -def test_set_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.SetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,]) +def test_set_iam_policy(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6576,10 +6485,6 @@ def test_set_iam_policy( assert response.etag == b"etag_blob" -def test_set_iam_policy_from_dict(): - test_set_iam_policy(request_type=dict) - - def test_set_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6761,9 +6666,8 @@ async def test_set_iam_policy_flattened_error_async(): ) -def test_get_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.GetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,]) +def test_get_iam_policy(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6789,10 +6693,6 @@ def test_get_iam_policy( assert response.etag == b"etag_blob" -def test_get_iam_policy_from_dict(): - test_get_iam_policy(request_type=dict) - - def test_get_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6974,9 +6874,10 @@ async def test_get_iam_policy_flattened_error_async(): ) -def test_test_iam_permissions( - transport: str = "grpc", request_type=iam_policy_pb2.TestIamPermissionsRequest -): +@pytest.mark.parametrize( + "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,] +) +def test_test_iam_permissions(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -7005,10 +6906,6 @@ def test_test_iam_permissions( assert response.permissions == ["permissions_value"] -def test_test_iam_permissions_from_dict(): - test_test_iam_permissions(request_type=dict) - - def test_test_iam_permissions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -7806,7 +7703,7 @@ def test_parse_common_location_path(): assert expected == actual -def test_client_withDEFAULT_CLIENT_INFO(): +def test_client_with_default_client_info(): client_info = gapic_v1.client_info.ClientInfo() with mock.patch.object( diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py index eb01909f461f..c3cfbe08c456 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager.py @@ -258,20 +258,20 @@ def test_policy_tag_manager_client_client_options( # unsupported value. with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}): with pytest.raises(MutualTLSChannelError): - client = client_class() + client = client_class(transport=transport_name) # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value. with mock.patch.dict( os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"} ): with pytest.raises(ValueError): - client = client_class() + client = client_class(transport=transport_name) # Check the case quota_project_id is provided options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -340,7 +340,7 @@ def test_policy_tag_manager_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) if use_client_cert_env == "false": expected_client_cert_source = None @@ -435,7 +435,7 @@ def test_policy_tag_manager_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -466,7 +466,7 @@ def test_policy_tag_manager_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -499,9 +499,10 @@ def test_policy_tag_manager_client_client_options_from_dict(): ) -def test_create_taxonomy( - transport: str = "grpc", request_type=policytagmanager.CreateTaxonomyRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.CreateTaxonomyRequest, dict,] +) +def test_create_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -540,10 +541,6 @@ def test_create_taxonomy( ] -def test_create_taxonomy_from_dict(): - test_create_taxonomy(request_type=dict) - - def test_create_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -749,9 +746,10 @@ async def test_create_taxonomy_flattened_error_async(): ) -def test_delete_taxonomy( - transport: str = "grpc", request_type=policytagmanager.DeleteTaxonomyRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.DeleteTaxonomyRequest, dict,] +) +def test_delete_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -775,10 +773,6 @@ def test_delete_taxonomy( assert response is None -def test_delete_taxonomy_from_dict(): - test_delete_taxonomy(request_type=dict) - - def test_delete_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -947,9 +941,10 @@ async def test_delete_taxonomy_flattened_error_async(): ) -def test_update_taxonomy( - transport: str = "grpc", request_type=policytagmanager.UpdateTaxonomyRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.UpdateTaxonomyRequest, dict,] +) +def test_update_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -988,10 +983,6 @@ def test_update_taxonomy( ] -def test_update_taxonomy_from_dict(): - test_update_taxonomy(request_type=dict) - - def test_update_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1189,9 +1180,10 @@ async def test_update_taxonomy_flattened_error_async(): ) -def test_list_taxonomies( - transport: str = "grpc", request_type=policytagmanager.ListTaxonomiesRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.ListTaxonomiesRequest, dict,] +) +def test_list_taxonomies(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1218,10 +1210,6 @@ def test_list_taxonomies( assert response.next_page_token == "next_page_token_value" -def test_list_taxonomies_from_dict(): - test_list_taxonomies(request_type=dict) - - def test_list_taxonomies_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1399,8 +1387,10 @@ async def test_list_taxonomies_flattened_error_async(): ) -def test_list_taxonomies_pager(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_taxonomies_pager(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_taxonomies), "__call__") as call: @@ -1439,8 +1429,10 @@ def test_list_taxonomies_pager(): assert all(isinstance(i, policytagmanager.Taxonomy) for i in results) -def test_list_taxonomies_pages(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_taxonomies_pages(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_taxonomies), "__call__") as call: @@ -1549,9 +1541,8 @@ async def test_list_taxonomies_async_pages(): assert page_.raw_page.next_page_token == token -def test_get_taxonomy( - transport: str = "grpc", request_type=policytagmanager.GetTaxonomyRequest -): +@pytest.mark.parametrize("request_type", [policytagmanager.GetTaxonomyRequest, dict,]) +def test_get_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1590,10 +1581,6 @@ def test_get_taxonomy( ] -def test_get_taxonomy_from_dict(): - test_get_taxonomy(request_type=dict) - - def test_get_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1783,9 +1770,10 @@ async def test_get_taxonomy_flattened_error_async(): ) -def test_create_policy_tag( - transport: str = "grpc", request_type=policytagmanager.CreatePolicyTagRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.CreatePolicyTagRequest, dict,] +) +def test_create_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1822,10 +1810,6 @@ def test_create_policy_tag( assert response.child_policy_tags == ["child_policy_tags_value"] -def test_create_policy_tag_from_dict(): - test_create_policy_tag(request_type=dict) - - def test_create_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2040,9 +2024,10 @@ async def test_create_policy_tag_flattened_error_async(): ) -def test_delete_policy_tag( - transport: str = "grpc", request_type=policytagmanager.DeletePolicyTagRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.DeletePolicyTagRequest, dict,] +) +def test_delete_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2068,10 +2053,6 @@ def test_delete_policy_tag( assert response is None -def test_delete_policy_tag_from_dict(): - test_delete_policy_tag(request_type=dict) - - def test_delete_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2253,9 +2234,10 @@ async def test_delete_policy_tag_flattened_error_async(): ) -def test_update_policy_tag( - transport: str = "grpc", request_type=policytagmanager.UpdatePolicyTagRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.UpdatePolicyTagRequest, dict,] +) +def test_update_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2292,10 +2274,6 @@ def test_update_policy_tag( assert response.child_policy_tags == ["child_policy_tags_value"] -def test_update_policy_tag_from_dict(): - test_update_policy_tag(request_type=dict) - - def test_update_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2504,9 +2482,10 @@ async def test_update_policy_tag_flattened_error_async(): ) -def test_list_policy_tags( - transport: str = "grpc", request_type=policytagmanager.ListPolicyTagsRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.ListPolicyTagsRequest, dict,] +) +def test_list_policy_tags(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2533,10 +2512,6 @@ def test_list_policy_tags( assert response.next_page_token == "next_page_token_value" -def test_list_policy_tags_from_dict(): - test_list_policy_tags(request_type=dict) - - def test_list_policy_tags_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2714,8 +2689,10 @@ async def test_list_policy_tags_flattened_error_async(): ) -def test_list_policy_tags_pager(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_policy_tags_pager(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_policy_tags), "__call__") as call: @@ -2757,8 +2734,10 @@ def test_list_policy_tags_pager(): assert all(isinstance(i, policytagmanager.PolicyTag) for i in results) -def test_list_policy_tags_pages(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_policy_tags_pages(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_policy_tags), "__call__") as call: @@ -2876,9 +2855,8 @@ async def test_list_policy_tags_async_pages(): assert page_.raw_page.next_page_token == token -def test_get_policy_tag( - transport: str = "grpc", request_type=policytagmanager.GetPolicyTagRequest -): +@pytest.mark.parametrize("request_type", [policytagmanager.GetPolicyTagRequest, dict,]) +def test_get_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2913,10 +2891,6 @@ def test_get_policy_tag( assert response.child_policy_tags == ["child_policy_tags_value"] -def test_get_policy_tag_from_dict(): - test_get_policy_tag(request_type=dict) - - def test_get_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3102,9 +3076,8 @@ async def test_get_policy_tag_flattened_error_async(): ) -def test_get_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.GetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,]) +def test_get_iam_policy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3130,10 +3103,6 @@ def test_get_iam_policy( assert response.etag == b"etag_blob" -def test_get_iam_policy_from_dict(): - test_get_iam_policy(request_type=dict) - - def test_get_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3251,9 +3220,8 @@ def test_get_iam_policy_from_dict_foreign(): call.assert_called() -def test_set_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.SetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,]) +def test_set_iam_policy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3279,10 +3247,6 @@ def test_set_iam_policy( assert response.etag == b"etag_blob" -def test_set_iam_policy_from_dict(): - test_set_iam_policy(request_type=dict) - - def test_set_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3400,9 +3364,10 @@ def test_set_iam_policy_from_dict_foreign(): call.assert_called() -def test_test_iam_permissions( - transport: str = "grpc", request_type=iam_policy_pb2.TestIamPermissionsRequest -): +@pytest.mark.parametrize( + "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,] +) +def test_test_iam_permissions(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3431,10 +3396,6 @@ def test_test_iam_permissions( assert response.permissions == ["permissions_value"] -def test_test_iam_permissions_from_dict(): - test_test_iam_permissions(request_type=dict) - - def test_test_iam_permissions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4120,7 +4081,7 @@ def test_parse_common_location_path(): assert expected == actual -def test_client_withDEFAULT_CLIENT_INFO(): +def test_client_with_default_client_info(): client_info = gapic_v1.client_info.ClientInfo() with mock.patch.object( diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py index cbb99d3aedcd..234d3952a014 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1/test_policy_tag_manager_serialization.py @@ -272,20 +272,20 @@ def test_policy_tag_manager_serialization_client_client_options( # unsupported value. with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}): with pytest.raises(MutualTLSChannelError): - client = client_class() + client = client_class(transport=transport_name) # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value. with mock.patch.dict( os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"} ): with pytest.raises(ValueError): - client = client_class() + client = client_class(transport=transport_name) # Check the case quota_project_id is provided options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -354,7 +354,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) if use_client_cert_env == "false": expected_client_cert_source = None @@ -453,7 +453,7 @@ def test_policy_tag_manager_serialization_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -488,7 +488,7 @@ def test_policy_tag_manager_serialization_client_client_options_credentials_file options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -521,10 +521,10 @@ def test_policy_tag_manager_serialization_client_client_options_from_dict(): ) -def test_replace_taxonomy( - transport: str = "grpc", - request_type=policytagmanagerserialization.ReplaceTaxonomyRequest, -): +@pytest.mark.parametrize( + "request_type", [policytagmanagerserialization.ReplaceTaxonomyRequest, dict,] +) +def test_replace_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerSerializationClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -563,10 +563,6 @@ def test_replace_taxonomy( ] -def test_replace_taxonomy_from_dict(): - test_replace_taxonomy(request_type=dict) - - def test_replace_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -687,10 +683,10 @@ async def test_replace_taxonomy_field_headers_async(): assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] -def test_import_taxonomies( - transport: str = "grpc", - request_type=policytagmanagerserialization.ImportTaxonomiesRequest, -): +@pytest.mark.parametrize( + "request_type", [policytagmanagerserialization.ImportTaxonomiesRequest, dict,] +) +def test_import_taxonomies(request_type, transport: str = "grpc"): client = PolicyTagManagerSerializationClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -716,10 +712,6 @@ def test_import_taxonomies( assert isinstance(response, policytagmanagerserialization.ImportTaxonomiesResponse) -def test_import_taxonomies_from_dict(): - test_import_taxonomies(request_type=dict) - - def test_import_taxonomies_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -833,10 +825,10 @@ async def test_import_taxonomies_field_headers_async(): assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] -def test_export_taxonomies( - transport: str = "grpc", - request_type=policytagmanagerserialization.ExportTaxonomiesRequest, -): +@pytest.mark.parametrize( + "request_type", [policytagmanagerserialization.ExportTaxonomiesRequest, dict,] +) +def test_export_taxonomies(request_type, transport: str = "grpc"): client = PolicyTagManagerSerializationClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -862,10 +854,6 @@ def test_export_taxonomies( assert isinstance(response, policytagmanagerserialization.ExportTaxonomiesResponse) -def test_export_taxonomies_from_dict(): - test_export_taxonomies(request_type=dict) - - def test_export_taxonomies_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1512,7 +1500,7 @@ def test_parse_common_location_path(): assert expected == actual -def test_client_withDEFAULT_CLIENT_INFO(): +def test_client_with_default_client_info(): client_info = gapic_v1.client_info.ClientInfo() with mock.patch.object( diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py index 09c90335ade9..041e8cb481a1 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_data_catalog.py @@ -252,20 +252,20 @@ def test_data_catalog_client_client_options( # unsupported value. with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}): with pytest.raises(MutualTLSChannelError): - client = client_class() + client = client_class(transport=transport_name) # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value. with mock.patch.dict( os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"} ): with pytest.raises(ValueError): - client = client_class() + client = client_class(transport=transport_name) # Check the case quota_project_id is provided options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -322,7 +322,7 @@ def test_data_catalog_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) if use_client_cert_env == "false": expected_client_cert_source = None @@ -417,7 +417,7 @@ def test_data_catalog_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -448,7 +448,7 @@ def test_data_catalog_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -479,9 +479,8 @@ def test_data_catalog_client_client_options_from_dict(): ) -def test_search_catalog( - transport: str = "grpc", request_type=datacatalog.SearchCatalogRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.SearchCatalogRequest, dict,]) +def test_search_catalog(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -508,10 +507,6 @@ def test_search_catalog( assert response.next_page_token == "next_page_token_value" -def test_search_catalog_from_dict(): - test_search_catalog(request_type=dict) - - def test_search_catalog_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -658,8 +653,10 @@ async def test_search_catalog_flattened_error_async(): ) -def test_search_catalog_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_search_catalog_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.search_catalog), "__call__") as call: @@ -693,8 +690,10 @@ def test_search_catalog_pager(): assert all(isinstance(i, search.SearchCatalogResult) for i in results) -def test_search_catalog_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_search_catalog_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.search_catalog), "__call__") as call: @@ -793,9 +792,8 @@ async def test_search_catalog_async_pages(): assert page_.raw_page.next_page_token == token -def test_create_entry_group( - transport: str = "grpc", request_type=datacatalog.CreateEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.CreateEntryGroupRequest, dict,]) +def test_create_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -828,10 +826,6 @@ def test_create_entry_group( assert response.description == "description_value" -def test_create_entry_group_from_dict(): - test_create_entry_group(request_type=dict) - - def test_create_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1045,9 +1039,8 @@ async def test_create_entry_group_flattened_error_async(): ) -def test_update_entry_group( - transport: str = "grpc", request_type=datacatalog.UpdateEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateEntryGroupRequest, dict,]) +def test_update_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1080,10 +1073,6 @@ def test_update_entry_group( assert response.description == "description_value" -def test_update_entry_group_from_dict(): - test_update_entry_group(request_type=dict) - - def test_update_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1291,9 +1280,8 @@ async def test_update_entry_group_flattened_error_async(): ) -def test_get_entry_group( - transport: str = "grpc", request_type=datacatalog.GetEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.GetEntryGroupRequest, dict,]) +def test_get_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1324,10 +1312,6 @@ def test_get_entry_group( assert response.description == "description_value" -def test_get_entry_group_from_dict(): - test_get_entry_group(request_type=dict) - - def test_get_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1519,9 +1503,8 @@ async def test_get_entry_group_flattened_error_async(): ) -def test_delete_entry_group( - transport: str = "grpc", request_type=datacatalog.DeleteEntryGroupRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteEntryGroupRequest, dict,]) +def test_delete_entry_group(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1547,10 +1530,6 @@ def test_delete_entry_group( assert response is None -def test_delete_entry_group_from_dict(): - test_delete_entry_group(request_type=dict) - - def test_delete_entry_group_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1725,9 +1704,8 @@ async def test_delete_entry_group_flattened_error_async(): ) -def test_list_entry_groups( - transport: str = "grpc", request_type=datacatalog.ListEntryGroupsRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.ListEntryGroupsRequest, dict,]) +def test_list_entry_groups(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1756,10 +1734,6 @@ def test_list_entry_groups( assert response.next_page_token == "next_page_token_value" -def test_list_entry_groups_from_dict(): - test_list_entry_groups(request_type=dict) - - def test_list_entry_groups_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1943,8 +1917,10 @@ async def test_list_entry_groups_flattened_error_async(): ) -def test_list_entry_groups_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entry_groups_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1985,8 +1961,10 @@ def test_list_entry_groups_pager(): assert all(isinstance(i, datacatalog.EntryGroup) for i in results) -def test_list_entry_groups_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entry_groups_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2097,9 +2075,8 @@ async def test_list_entry_groups_async_pages(): assert page_.raw_page.next_page_token == token -def test_create_entry( - transport: str = "grpc", request_type=datacatalog.CreateEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.CreateEntryRequest, dict,]) +def test_create_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2137,10 +2114,6 @@ def test_create_entry( assert response.description == "description_value" -def test_create_entry_from_dict(): - test_create_entry(request_type=dict) - - def test_create_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2340,9 +2313,8 @@ async def test_create_entry_flattened_error_async(): ) -def test_update_entry( - transport: str = "grpc", request_type=datacatalog.UpdateEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateEntryRequest, dict,]) +def test_update_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2380,10 +2352,6 @@ def test_update_entry( assert response.description == "description_value" -def test_update_entry_from_dict(): - test_update_entry(request_type=dict) - - def test_update_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2573,9 +2541,8 @@ async def test_update_entry_flattened_error_async(): ) -def test_delete_entry( - transport: str = "grpc", request_type=datacatalog.DeleteEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteEntryRequest, dict,]) +def test_delete_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2599,10 +2566,6 @@ def test_delete_entry( assert response is None -def test_delete_entry_from_dict(): - test_delete_entry(request_type=dict) - - def test_delete_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2765,7 +2728,8 @@ async def test_delete_entry_flattened_error_async(): ) -def test_get_entry(transport: str = "grpc", request_type=datacatalog.GetEntryRequest): +@pytest.mark.parametrize("request_type", [datacatalog.GetEntryRequest, dict,]) +def test_get_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2803,10 +2767,6 @@ def test_get_entry(transport: str = "grpc", request_type=datacatalog.GetEntryReq assert response.description == "description_value" -def test_get_entry_from_dict(): - test_get_entry(request_type=dict) - - def test_get_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2980,9 +2940,8 @@ async def test_get_entry_flattened_error_async(): ) -def test_lookup_entry( - transport: str = "grpc", request_type=datacatalog.LookupEntryRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.LookupEntryRequest, dict,]) +def test_lookup_entry(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3020,10 +2979,6 @@ def test_lookup_entry( assert response.description == "description_value" -def test_lookup_entry_from_dict(): - test_lookup_entry(request_type=dict) - - def test_lookup_entry_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3082,9 +3037,8 @@ async def test_lookup_entry_async_from_dict(): await test_lookup_entry_async(request_type=dict) -def test_list_entries( - transport: str = "grpc", request_type=datacatalog.ListEntriesRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.ListEntriesRequest, dict,]) +def test_list_entries(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3111,10 +3065,6 @@ def test_list_entries( assert response.next_page_token == "next_page_token_value" -def test_list_entries_from_dict(): - test_list_entries(request_type=dict) - - def test_list_entries_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3284,8 +3234,10 @@ async def test_list_entries_flattened_error_async(): ) -def test_list_entries_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entries_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_entries), "__call__") as call: @@ -3322,8 +3274,10 @@ def test_list_entries_pager(): assert all(isinstance(i, datacatalog.Entry) for i in results) -def test_list_entries_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_entries_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_entries), "__call__") as call: @@ -3422,9 +3376,8 @@ async def test_list_entries_async_pages(): assert page_.raw_page.next_page_token == token -def test_create_tag_template( - transport: str = "grpc", request_type=datacatalog.CreateTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.CreateTagTemplateRequest, dict,]) +def test_create_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3454,10 +3407,6 @@ def test_create_tag_template( assert response.display_name == "display_name_value" -def test_create_tag_template_from_dict(): - test_create_tag_template(request_type=dict) - - def test_create_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3662,9 +3611,8 @@ async def test_create_tag_template_flattened_error_async(): ) -def test_get_tag_template( - transport: str = "grpc", request_type=datacatalog.GetTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.GetTagTemplateRequest, dict,]) +def test_get_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3692,10 +3640,6 @@ def test_get_tag_template( assert response.display_name == "display_name_value" -def test_get_tag_template_from_dict(): - test_get_tag_template(request_type=dict) - - def test_get_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3862,9 +3806,8 @@ async def test_get_tag_template_flattened_error_async(): ) -def test_update_tag_template( - transport: str = "grpc", request_type=datacatalog.UpdateTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateTagTemplateRequest, dict,]) +def test_update_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3894,10 +3837,6 @@ def test_update_tag_template( assert response.display_name == "display_name_value" -def test_update_tag_template_from_dict(): - test_update_tag_template(request_type=dict) - - def test_update_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4098,9 +4037,8 @@ async def test_update_tag_template_flattened_error_async(): ) -def test_delete_tag_template( - transport: str = "grpc", request_type=datacatalog.DeleteTagTemplateRequest -): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteTagTemplateRequest, dict,]) +def test_delete_tag_template(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4126,10 +4064,6 @@ def test_delete_tag_template( assert response is None -def test_delete_tag_template_from_dict(): - test_delete_tag_template(request_type=dict) - - def test_delete_tag_template_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4312,9 +4246,10 @@ async def test_delete_tag_template_flattened_error_async(): ) -def test_create_tag_template_field( - transport: str = "grpc", request_type=datacatalog.CreateTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.CreateTagTemplateFieldRequest, dict,] +) +def test_create_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4349,10 +4284,6 @@ def test_create_tag_template_field( assert response.order == 540 -def test_create_tag_template_field_from_dict(): - test_create_tag_template_field(request_type=dict) - - def test_create_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4569,9 +4500,10 @@ async def test_create_tag_template_field_flattened_error_async(): ) -def test_update_tag_template_field( - transport: str = "grpc", request_type=datacatalog.UpdateTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.UpdateTagTemplateFieldRequest, dict,] +) +def test_update_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4606,10 +4538,6 @@ def test_update_tag_template_field( assert response.order == 540 -def test_update_tag_template_field_from_dict(): - test_update_tag_template_field(request_type=dict) - - def test_update_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4826,9 +4754,10 @@ async def test_update_tag_template_field_flattened_error_async(): ) -def test_rename_tag_template_field( - transport: str = "grpc", request_type=datacatalog.RenameTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.RenameTagTemplateFieldRequest, dict,] +) +def test_rename_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -4863,10 +4792,6 @@ def test_rename_tag_template_field( assert response.order == 540 -def test_rename_tag_template_field_from_dict(): - test_rename_tag_template_field(request_type=dict) - - def test_rename_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5073,9 +4998,10 @@ async def test_rename_tag_template_field_flattened_error_async(): ) -def test_delete_tag_template_field( - transport: str = "grpc", request_type=datacatalog.DeleteTagTemplateFieldRequest -): +@pytest.mark.parametrize( + "request_type", [datacatalog.DeleteTagTemplateFieldRequest, dict,] +) +def test_delete_tag_template_field(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5101,10 +5027,6 @@ def test_delete_tag_template_field( assert response is None -def test_delete_tag_template_field_from_dict(): - test_delete_tag_template_field(request_type=dict) - - def test_delete_tag_template_field_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5290,7 +5212,8 @@ async def test_delete_tag_template_field_flattened_error_async(): ) -def test_create_tag(transport: str = "grpc", request_type=datacatalog.CreateTagRequest): +@pytest.mark.parametrize("request_type", [datacatalog.CreateTagRequest, dict,]) +def test_create_tag(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5322,10 +5245,6 @@ def test_create_tag(transport: str = "grpc", request_type=datacatalog.CreateTagR assert response.template_display_name == "template_display_name_value" -def test_create_tag_from_dict(): - test_create_tag(request_type=dict) - - def test_create_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5511,7 +5430,8 @@ async def test_create_tag_flattened_error_async(): ) -def test_update_tag(transport: str = "grpc", request_type=datacatalog.UpdateTagRequest): +@pytest.mark.parametrize("request_type", [datacatalog.UpdateTagRequest, dict,]) +def test_update_tag(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5543,10 +5463,6 @@ def test_update_tag(transport: str = "grpc", request_type=datacatalog.UpdateTagR assert response.template_display_name == "template_display_name_value" -def test_update_tag_from_dict(): - test_update_tag(request_type=dict) - - def test_update_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5734,7 +5650,8 @@ async def test_update_tag_flattened_error_async(): ) -def test_delete_tag(transport: str = "grpc", request_type=datacatalog.DeleteTagRequest): +@pytest.mark.parametrize("request_type", [datacatalog.DeleteTagRequest, dict,]) +def test_delete_tag(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5758,10 +5675,6 @@ def test_delete_tag(transport: str = "grpc", request_type=datacatalog.DeleteTagR assert response is None -def test_delete_tag_from_dict(): - test_delete_tag(request_type=dict) - - def test_delete_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -5924,7 +5837,8 @@ async def test_delete_tag_flattened_error_async(): ) -def test_list_tags(transport: str = "grpc", request_type=datacatalog.ListTagsRequest): +@pytest.mark.parametrize("request_type", [datacatalog.ListTagsRequest, dict,]) +def test_list_tags(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -5951,10 +5865,6 @@ def test_list_tags(transport: str = "grpc", request_type=datacatalog.ListTagsReq assert response.next_page_token == "next_page_token_value" -def test_list_tags_from_dict(): - test_list_tags(request_type=dict) - - def test_list_tags_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6124,8 +6034,10 @@ async def test_list_tags_flattened_error_async(): ) -def test_list_tags_pager(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_tags_pager(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_tags), "__call__") as call: @@ -6153,8 +6065,10 @@ def test_list_tags_pager(): assert all(isinstance(i, tags.Tag) for i in results) -def test_list_tags_pages(): - client = DataCatalogClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_tags_pages(transport_name: str = "grpc"): + client = DataCatalogClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_tags), "__call__") as call: @@ -6226,9 +6140,8 @@ async def test_list_tags_async_pages(): assert page_.raw_page.next_page_token == token -def test_set_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.SetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,]) +def test_set_iam_policy(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6254,10 +6167,6 @@ def test_set_iam_policy( assert response.etag == b"etag_blob" -def test_set_iam_policy_from_dict(): - test_set_iam_policy(request_type=dict) - - def test_set_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6439,9 +6348,8 @@ async def test_set_iam_policy_flattened_error_async(): ) -def test_get_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.GetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,]) +def test_get_iam_policy(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6467,10 +6375,6 @@ def test_get_iam_policy( assert response.etag == b"etag_blob" -def test_get_iam_policy_from_dict(): - test_get_iam_policy(request_type=dict) - - def test_get_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -6652,9 +6556,10 @@ async def test_get_iam_policy_flattened_error_async(): ) -def test_test_iam_permissions( - transport: str = "grpc", request_type=iam_policy_pb2.TestIamPermissionsRequest -): +@pytest.mark.parametrize( + "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,] +) +def test_test_iam_permissions(request_type, transport: str = "grpc"): client = DataCatalogClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -6683,10 +6588,6 @@ def test_test_iam_permissions( assert response.permissions == ["permissions_value"] -def test_test_iam_permissions_from_dict(): - test_test_iam_permissions(request_type=dict) - - def test_test_iam_permissions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -7449,7 +7350,7 @@ def test_parse_common_location_path(): assert expected == actual -def test_client_withDEFAULT_CLIENT_INFO(): +def test_client_with_default_client_info(): client_info = gapic_v1.client_info.ClientInfo() with mock.patch.object( diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py index 45ac136d6364..0590bf40de28 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager.py @@ -256,20 +256,20 @@ def test_policy_tag_manager_client_client_options( # unsupported value. with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}): with pytest.raises(MutualTLSChannelError): - client = client_class() + client = client_class(transport=transport_name) # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value. with mock.patch.dict( os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"} ): with pytest.raises(ValueError): - client = client_class() + client = client_class(transport=transport_name) # Check the case quota_project_id is provided options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -338,7 +338,7 @@ def test_policy_tag_manager_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) if use_client_cert_env == "false": expected_client_cert_source = None @@ -433,7 +433,7 @@ def test_policy_tag_manager_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -464,7 +464,7 @@ def test_policy_tag_manager_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -497,9 +497,10 @@ def test_policy_tag_manager_client_client_options_from_dict(): ) -def test_create_taxonomy( - transport: str = "grpc", request_type=policytagmanager.CreateTaxonomyRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.CreateTaxonomyRequest, dict,] +) +def test_create_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -536,10 +537,6 @@ def test_create_taxonomy( ] -def test_create_taxonomy_from_dict(): - test_create_taxonomy(request_type=dict) - - def test_create_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -743,9 +740,10 @@ async def test_create_taxonomy_flattened_error_async(): ) -def test_delete_taxonomy( - transport: str = "grpc", request_type=policytagmanager.DeleteTaxonomyRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.DeleteTaxonomyRequest, dict,] +) +def test_delete_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -769,10 +767,6 @@ def test_delete_taxonomy( assert response is None -def test_delete_taxonomy_from_dict(): - test_delete_taxonomy(request_type=dict) - - def test_delete_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -941,9 +935,10 @@ async def test_delete_taxonomy_flattened_error_async(): ) -def test_update_taxonomy( - transport: str = "grpc", request_type=policytagmanager.UpdateTaxonomyRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.UpdateTaxonomyRequest, dict,] +) +def test_update_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -980,10 +975,6 @@ def test_update_taxonomy( ] -def test_update_taxonomy_from_dict(): - test_update_taxonomy(request_type=dict) - - def test_update_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1179,9 +1170,10 @@ async def test_update_taxonomy_flattened_error_async(): ) -def test_list_taxonomies( - transport: str = "grpc", request_type=policytagmanager.ListTaxonomiesRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.ListTaxonomiesRequest, dict,] +) +def test_list_taxonomies(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1208,10 +1200,6 @@ def test_list_taxonomies( assert response.next_page_token == "next_page_token_value" -def test_list_taxonomies_from_dict(): - test_list_taxonomies(request_type=dict) - - def test_list_taxonomies_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1389,8 +1377,10 @@ async def test_list_taxonomies_flattened_error_async(): ) -def test_list_taxonomies_pager(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_taxonomies_pager(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_taxonomies), "__call__") as call: @@ -1429,8 +1419,10 @@ def test_list_taxonomies_pager(): assert all(isinstance(i, policytagmanager.Taxonomy) for i in results) -def test_list_taxonomies_pages(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_taxonomies_pages(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_taxonomies), "__call__") as call: @@ -1539,9 +1531,8 @@ async def test_list_taxonomies_async_pages(): assert page_.raw_page.next_page_token == token -def test_get_taxonomy( - transport: str = "grpc", request_type=policytagmanager.GetTaxonomyRequest -): +@pytest.mark.parametrize("request_type", [policytagmanager.GetTaxonomyRequest, dict,]) +def test_get_taxonomy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1578,10 +1569,6 @@ def test_get_taxonomy( ] -def test_get_taxonomy_from_dict(): - test_get_taxonomy(request_type=dict) - - def test_get_taxonomy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1769,9 +1756,10 @@ async def test_get_taxonomy_flattened_error_async(): ) -def test_create_policy_tag( - transport: str = "grpc", request_type=policytagmanager.CreatePolicyTagRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.CreatePolicyTagRequest, dict,] +) +def test_create_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1808,10 +1796,6 @@ def test_create_policy_tag( assert response.child_policy_tags == ["child_policy_tags_value"] -def test_create_policy_tag_from_dict(): - test_create_policy_tag(request_type=dict) - - def test_create_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2026,9 +2010,10 @@ async def test_create_policy_tag_flattened_error_async(): ) -def test_delete_policy_tag( - transport: str = "grpc", request_type=policytagmanager.DeletePolicyTagRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.DeletePolicyTagRequest, dict,] +) +def test_delete_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2054,10 +2039,6 @@ def test_delete_policy_tag( assert response is None -def test_delete_policy_tag_from_dict(): - test_delete_policy_tag(request_type=dict) - - def test_delete_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2239,9 +2220,10 @@ async def test_delete_policy_tag_flattened_error_async(): ) -def test_update_policy_tag( - transport: str = "grpc", request_type=policytagmanager.UpdatePolicyTagRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.UpdatePolicyTagRequest, dict,] +) +def test_update_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2278,10 +2260,6 @@ def test_update_policy_tag( assert response.child_policy_tags == ["child_policy_tags_value"] -def test_update_policy_tag_from_dict(): - test_update_policy_tag(request_type=dict) - - def test_update_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2490,9 +2468,10 @@ async def test_update_policy_tag_flattened_error_async(): ) -def test_list_policy_tags( - transport: str = "grpc", request_type=policytagmanager.ListPolicyTagsRequest -): +@pytest.mark.parametrize( + "request_type", [policytagmanager.ListPolicyTagsRequest, dict,] +) +def test_list_policy_tags(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2519,10 +2498,6 @@ def test_list_policy_tags( assert response.next_page_token == "next_page_token_value" -def test_list_policy_tags_from_dict(): - test_list_policy_tags(request_type=dict) - - def test_list_policy_tags_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -2700,8 +2675,10 @@ async def test_list_policy_tags_flattened_error_async(): ) -def test_list_policy_tags_pager(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_policy_tags_pager(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_policy_tags), "__call__") as call: @@ -2743,8 +2720,10 @@ def test_list_policy_tags_pager(): assert all(isinstance(i, policytagmanager.PolicyTag) for i in results) -def test_list_policy_tags_pages(): - client = PolicyTagManagerClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_policy_tags_pages(transport_name: str = "grpc"): + client = PolicyTagManagerClient( + credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_policy_tags), "__call__") as call: @@ -2862,9 +2841,8 @@ async def test_list_policy_tags_async_pages(): assert page_.raw_page.next_page_token == token -def test_get_policy_tag( - transport: str = "grpc", request_type=policytagmanager.GetPolicyTagRequest -): +@pytest.mark.parametrize("request_type", [policytagmanager.GetPolicyTagRequest, dict,]) +def test_get_policy_tag(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -2899,10 +2877,6 @@ def test_get_policy_tag( assert response.child_policy_tags == ["child_policy_tags_value"] -def test_get_policy_tag_from_dict(): - test_get_policy_tag(request_type=dict) - - def test_get_policy_tag_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3088,9 +3062,8 @@ async def test_get_policy_tag_flattened_error_async(): ) -def test_get_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.GetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,]) +def test_get_iam_policy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3116,10 +3089,6 @@ def test_get_iam_policy( assert response.etag == b"etag_blob" -def test_get_iam_policy_from_dict(): - test_get_iam_policy(request_type=dict) - - def test_get_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3237,9 +3206,8 @@ def test_get_iam_policy_from_dict_foreign(): call.assert_called() -def test_set_iam_policy( - transport: str = "grpc", request_type=iam_policy_pb2.SetIamPolicyRequest -): +@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,]) +def test_set_iam_policy(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3265,10 +3233,6 @@ def test_set_iam_policy( assert response.etag == b"etag_blob" -def test_set_iam_policy_from_dict(): - test_set_iam_policy(request_type=dict) - - def test_set_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -3386,9 +3350,10 @@ def test_set_iam_policy_from_dict_foreign(): call.assert_called() -def test_test_iam_permissions( - transport: str = "grpc", request_type=iam_policy_pb2.TestIamPermissionsRequest -): +@pytest.mark.parametrize( + "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,] +) +def test_test_iam_permissions(request_type, transport: str = "grpc"): client = PolicyTagManagerClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -3417,10 +3382,6 @@ def test_test_iam_permissions( assert response.permissions == ["permissions_value"] -def test_test_iam_permissions_from_dict(): - test_test_iam_permissions(request_type=dict) - - def test_test_iam_permissions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -4106,7 +4067,7 @@ def test_parse_common_location_path(): assert expected == actual -def test_client_withDEFAULT_CLIENT_INFO(): +def test_client_with_default_client_info(): client_info = gapic_v1.client_info.ClientInfo() with mock.patch.object( diff --git a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py index 4b70eeb1c9e9..7b441b5e0039 100644 --- a/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py +++ b/packages/google-cloud-datacatalog/tests/unit/gapic/datacatalog_v1beta1/test_policy_tag_manager_serialization.py @@ -271,20 +271,20 @@ def test_policy_tag_manager_serialization_client_client_options( # unsupported value. with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}): with pytest.raises(MutualTLSChannelError): - client = client_class() + client = client_class(transport=transport_name) # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value. with mock.patch.dict( os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"} ): with pytest.raises(ValueError): - client = client_class() + client = client_class(transport=transport_name) # Check the case quota_project_id is provided options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -353,7 +353,7 @@ def test_policy_tag_manager_serialization_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) if use_client_cert_env == "false": expected_client_cert_source = None @@ -452,7 +452,7 @@ def test_policy_tag_manager_serialization_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -487,7 +487,7 @@ def test_policy_tag_manager_serialization_client_client_options_credentials_file options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(transport=transport_name, client_options=options) + client = client_class(client_options=options, transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -520,10 +520,10 @@ def test_policy_tag_manager_serialization_client_client_options_from_dict(): ) -def test_import_taxonomies( - transport: str = "grpc", - request_type=policytagmanagerserialization.ImportTaxonomiesRequest, -): +@pytest.mark.parametrize( + "request_type", [policytagmanagerserialization.ImportTaxonomiesRequest, dict,] +) +def test_import_taxonomies(request_type, transport: str = "grpc"): client = PolicyTagManagerSerializationClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -549,10 +549,6 @@ def test_import_taxonomies( assert isinstance(response, policytagmanagerserialization.ImportTaxonomiesResponse) -def test_import_taxonomies_from_dict(): - test_import_taxonomies(request_type=dict) - - def test_import_taxonomies_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -666,10 +662,10 @@ async def test_import_taxonomies_field_headers_async(): assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] -def test_export_taxonomies( - transport: str = "grpc", - request_type=policytagmanagerserialization.ExportTaxonomiesRequest, -): +@pytest.mark.parametrize( + "request_type", [policytagmanagerserialization.ExportTaxonomiesRequest, dict,] +) +def test_export_taxonomies(request_type, transport: str = "grpc"): client = PolicyTagManagerSerializationClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -695,10 +691,6 @@ def test_export_taxonomies( assert isinstance(response, policytagmanagerserialization.ExportTaxonomiesResponse) -def test_export_taxonomies_from_dict(): - test_export_taxonomies(request_type=dict) - - def test_export_taxonomies_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. @@ -1344,7 +1336,7 @@ def test_parse_common_location_path(): assert expected == actual -def test_client_withDEFAULT_CLIENT_INFO(): +def test_client_with_default_client_info(): client_info = gapic_v1.client_info.ClientInfo() with mock.patch.object(