From b0403b2d98b2776d15475f6b525409670e2841fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaeyeon=20Kim=28=EA=B9=80=EC=9E=AC=EC=97=B0=29?= Date: Mon, 2 Jun 2025 09:20:07 -0700 Subject: [PATCH] Copybara import of the project: -- 8772b3de0b2fd04f246cc90c4c8032f9dc8cfed9 by Jaeyeon Kim : fix: update unit test code for test_connection - Fix for Unit Test Failures -- 8e0b45c2a64994bfda6401847e485fdd9edc8306 by Jaeyeon Kim : fix useless changes -- 54efa004fa0fc9bcf78b49061221994650e162bc by Jaeyeon Kim : fix conflict resolve issue -- 003ed4418c73b74bfba5ff055a364b62ddc18fa7 by Wei Sun (Jack) : Autoformat test_connections_client.py COPYBARA_INTEGRATE_REVIEW=https://github.com/google/adk-python/pull/578 from anencore94:bugfix/failed_unittests ba0e1d33ad905b0b046023b685c70f4ef05e4efa PiperOrigin-RevId: 766221165 --- .github/workflows/python-unit-tests.yml | 3 +- .../clients/test_connections_client.py | 29 +++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-unit-tests.yml b/.github/workflows/python-unit-tests.yml index b3689ed..a504fde 100644 --- a/.github/workflows/python-unit-tests.yml +++ b/.github/workflows/python-unit-tests.yml @@ -50,5 +50,4 @@ jobs: source .venv/bin/activate pytest tests/unittests \ --ignore=tests/unittests/artifacts/test_artifact_service.py \ - --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py - + --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py diff --git a/tests/unittests/tools/application_integration_tool/clients/test_connections_client.py b/tests/unittests/tools/application_integration_tool/clients/test_connections_client.py index fbb5a09..84f41ab 100644 --- a/tests/unittests/tools/application_integration_tool/clients/test_connections_client.py +++ b/tests/unittests/tools/application_integration_tool/clients/test_connections_client.py @@ -181,6 +181,7 @@ class TestConnectionsClient: mock_response = mock.MagicMock() mock_response.status_code = 200 mock_response.json.return_value = { + "name": "test-connection", "serviceDirectory": "test_service", "host": "test.host", "tlsServiceDirectory": "tls_test_service", @@ -192,14 +193,38 @@ class TestConnectionsClient: ): details = client.get_connection_details() assert details == { + "name": "test-connection", "serviceName": "tls_test_service", "host": "test.host", "authOverrideEnabled": True, - "name": "", } def test_get_connection_details_success_without_host( self, project, location, connection_name, mock_credentials + ): + credentials = {"email": "test@example.com"} + client = ConnectionsClient(project, location, connection_name, credentials) + mock_response = mock.MagicMock() + mock_response.status_code = 200 + mock_response.json.return_value = { + "name": "test-connection", + "serviceDirectory": "test_service", + "authOverrideEnabled": False, + } + + with mock.patch.object( + client, "_execute_api_call", return_value=mock_response + ): + details = client.get_connection_details() + assert details == { + "name": "test-connection", + "serviceName": "test_service", + "host": "", + "authOverrideEnabled": False, + } + + def test_get_connection_details_without_name( + self, project, location, connection_name, mock_credentials ): credentials = {"email": "test@example.com"} client = ConnectionsClient(project, location, connection_name, credentials) @@ -215,10 +240,10 @@ class TestConnectionsClient: ): details = client.get_connection_details() assert details == { + "name": "", "serviceName": "test_service", "host": "", "authOverrideEnabled": False, - "name": "", } def test_get_connection_details_error(