Skip to content

Commit 56fcb5f

Browse files
authored
The original commit changed more that it should have. Only initialization of `__REQUIRED_FIELDS_DEFAULT_VALUE` should have been affected.
1 parent 6afc90f commit 56fcb5f

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
11091109
))
11101110

11111111
# verify fields with default values are dropped
1112-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
1112+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
11131113
{% set field_name = req_field.name | camel_case %}
11141114
assert "{{ field_name }}" not in jsonified_request
11151115
{% endfor %}
@@ -1118,13 +1118,13 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
11181118
jsonified_request.update(unset_fields)
11191119

11201120
# verify required fields with default values are now present
1121-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
1121+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
11221122
{% set field_name = req_field.name | camel_case %}
11231123
assert "{{ field_name }}" in jsonified_request
11241124
assert jsonified_request["{{ field_name }}"] == request_init["{{ req_field.name }}"]
11251125
{% endfor %}
11261126

1127-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
1127+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
11281128
{% set field_name = req_field.name | camel_case %}
11291129
{% set mock_value = req_field.primitive_mock_as_str() %}
11301130
{% if method.query_params %}
@@ -1143,7 +1143,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
11431143
jsonified_request.update(unset_fields)
11441144

11451145
# verify required fields with non-default values are left alone
1146-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
1146+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
11471147
{% set field_name = req_field.name | camel_case %}
11481148
{% set mock_value = req_field.primitive_mock_as_str() %}
11491149
assert "{{ field_name }}" in jsonified_request
@@ -1208,7 +1208,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
12081208
{% endif %}
12091209

12101210
expected_params = [
1211-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
1211+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
12121212
(
12131213
"{{ req_field.name | camel_case }}",
12141214
{% if req_field.field_pb.type == 9 %}

packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
973973
))
974974

975975
# verify fields with default values are dropped
976-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
976+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
977977
{% set field_name = req_field.name | camel_case %}
978978
assert "{{ field_name }}" not in jsonified_request
979979
{% endfor %}
@@ -982,7 +982,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
982982
jsonified_request.update(unset_fields)
983983

984984
# verify required fields with default values are now present
985-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
985+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
986986
{% set field_name = req_field.name | camel_case %}
987987
assert "{{ field_name }}" in jsonified_request
988988
assert jsonified_request["{{ field_name }}"] == request_init["{{ req_field.name }}"]
@@ -1067,7 +1067,7 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
10671067
{% endif %}
10681068

10691069
expected_params = [
1070-
{% for req_field in method.input.required_fields if req_field.name in method.query_params %}
1070+
{% for req_field in method.input.required_fields if req_field.is_primitive and req_field.name in method.query_params %}
10711071
(
10721072
"{{ req_field.name | camel_case }}",
10731073
{% if req_field.field_pb.type == 9 %}

0 commit comments

Comments
 (0)