Skip to content

chore: refactor tests related to AIP 4235 #17027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parthea wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore: refactor tests related to AIP 4235 #17027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
478ecd8
tests: fix unit test failure when auto_populated_fields is set
parthea May 5, 2026
69a9623
fix *rest_required_fields test actual vs expected when field is auto-…
parthea May 5, 2026
9b99fa1
address review feedback
parthea May 11, 2026
e07298e
chore: refactor tests related to AIP 4235
parthea May 11, 2026
82e1f1d
Merge remote-tracking branch 'origin/main' into use-empty-string-inst…
parthea May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,20 @@ def test_{{ method_name }}_non_empty_request_with_auto_populated_field():
call.assert_called()
_, args, _ = call.mock_calls[0]
{% with method_settings = api.all_method_settings.get(method.meta.address.proto) %}
request_msg = {{ method.input.ident }}(
{% for field in method.input.fields.values() if field.ident|string() == "str" and not field.uuid4 %}
{{ field.name }}={{ field.mock_value }},
{% endfor %}
)
{% if method_settings is not none %}
{% for auto_populated_field in method_settings.auto_populated_fields %}
# Ensure that the uuid4 field is set according to AIP 4235
assert re.match(r"{{ get_uuid4_re() }}", args[0].{{ auto_populated_field }})
# clear UUID field so that the check below succeeds
args[0].{{ auto_populated_field }} = None
request_msg.{{ auto_populated_field }} = args[0].{{ auto_populated_field }}
{% endfor %}
{% endif %}{# if method_settings is not none #}
{% endwith %}{# method_settings #}
assert args[0] == {{ method.input.ident }}(
{% for field in method.input.fields.values() if field.ident|string() == "str" and not field.uuid4 %}
{{ field.name }}={{ field.mock_value }},
{% endfor %}
)
assert args[0] == request_msg
{% endif %}

def test_{{ method_name }}_use_cached_wrapped_rpc():
Expand Down Expand Up @@ -1572,21 +1572,20 @@ def test_{{ method_name }}_rest_no_http_options():
# Establish that the underlying stub method was called.
call.assert_called()
_, args, {% if routing_param %}kw{% else %}_{% endif %} = call.mock_calls[0]
{% if request_dict %}
request_msg = {{ method.input.ident }}(**{{ request_dict }})
{% else %}
request_msg = {{ method.input.ident }}()
{% endif %}{# request_dict #}
{% with method_settings = api.all_method_settings.get(method.meta.address.proto) %}
{% if method_settings is not none %}
{% for auto_populated_field in method_settings.auto_populated_fields %}
# Ensure that the uuid4 field is set according to AIP 4235
assert re.match(r"{{ get_uuid4_re() }}", args[0].{{ auto_populated_field }})
# clear UUID field so that the check below succeeds
args[0].{{ auto_populated_field }} = None
request_msg.{{ auto_populated_field }} = args[0].{{ auto_populated_field }}
{% endfor %}{# for auto_populated_field in method_settings.auto_populated_fields #}
{% endif %}{# if method_settings is not none #}
{% endwith %}{# method_settings #}
{% if request_dict %}
request_msg = {{ method.input.ident }}(**{{ request_dict }})
{% else %}
request_msg = {{ method.input.ident }}()
{% endif %}{# request_dict #}
assert args[0] == request_msg

{% if routing_param %}
Expand Down
Loading
Loading