address review feedback

Author: parthea

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

@@ -1222,22 +1222,21 @@ def test_{{ method_name }}_rest_required_fields(request_type={{ method.input.ide
     {% 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
-            # and remove it so the expected/actual comparison succeeds.
-            # Otherwise, the actual will differ from the expected since
-            # this field was automatically populated.
-            found_field = None
             for i, (key, value) in enumerate(req.call_args.kwargs['params']):
                 if key == "{{ auto_populated_field|camel_case }}":
                     assert re.match(r"{{ get_uuid4_re() }}", value)
-                    found_field = i
                     break
-            if found_field is not None:
-                del req.call_args.kwargs['params'][found_field]
+            
+            # Include {{ auto_populated_field|camel_case }} within expected_params with value mock.ANY
+            expected_params = [p for p in expected_params if p[0] != "{{ auto_populated_field|camel_case }}"]
+            expected_params.append(
+                ("{{ auto_populated_field|camel_case }}", mock.ANY)
+            )
     {% endfor %}
     {% endif %}
     {% endwith %}
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_{{ method_name }}_rest_unset_required_fields():

packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py

@@ -9196,7 +9196,7 @@ def test_export_assets_rest_required_fields(request_type=asset_service.ExportAss
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_export_assets_rest_unset_required_fields():
@@ -9310,7 +9310,7 @@ def test_list_assets_rest_required_fields(request_type=asset_service.ListAssetsR
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_list_assets_rest_unset_required_fields():
@@ -9540,7 +9540,7 @@ def test_batch_get_assets_history_rest_required_fields(request_type=asset_servic
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_batch_get_assets_history_rest_unset_required_fields():
@@ -9657,7 +9657,7 @@ def test_create_feed_rest_required_fields(request_type=asset_service.CreateFeedR
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_create_feed_rest_unset_required_fields():
@@ -9823,7 +9823,7 @@ def test_get_feed_rest_required_fields(request_type=asset_service.GetFeedRequest
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_get_feed_rest_unset_required_fields():
@@ -9989,7 +9989,7 @@ def test_list_feeds_rest_required_fields(request_type=asset_service.ListFeedsReq
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_list_feeds_rest_unset_required_fields():
@@ -10151,7 +10151,7 @@ def test_update_feed_rest_required_fields(request_type=asset_service.UpdateFeedR
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_update_feed_rest_unset_required_fields():
@@ -10314,7 +10314,7 @@ def test_delete_feed_rest_required_fields(request_type=asset_service.DeleteFeedR
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_delete_feed_rest_unset_required_fields():
@@ -10480,7 +10480,7 @@ def test_search_all_resources_rest_required_fields(request_type=asset_service.Se
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_search_all_resources_rest_unset_required_fields():
@@ -10714,7 +10714,7 @@ def test_search_all_iam_policies_rest_required_fields(request_type=asset_service
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_search_all_iam_policies_rest_unset_required_fields():
@@ -10941,7 +10941,7 @@ def test_analyze_iam_policy_rest_required_fields(request_type=asset_service.Anal
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_analyze_iam_policy_rest_unset_required_fields():
@@ -11050,7 +11050,7 @@ def test_analyze_iam_policy_longrunning_rest_required_fields(request_type=asset_
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_analyze_iam_policy_longrunning_rest_unset_required_fields():
@@ -11175,7 +11175,7 @@ def test_analyze_move_rest_required_fields(request_type=asset_service.AnalyzeMov
                 ),
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_analyze_move_rest_unset_required_fields():
@@ -11288,7 +11288,7 @@ def test_query_assets_rest_required_fields(request_type=asset_service.QueryAsset
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_query_assets_rest_unset_required_fields():
@@ -11414,7 +11414,7 @@ def test_create_saved_query_rest_required_fields(request_type=asset_service.Crea
                 ),
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_create_saved_query_rest_unset_required_fields():
@@ -11584,7 +11584,7 @@ def test_get_saved_query_rest_required_fields(request_type=asset_service.GetSave
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_get_saved_query_rest_unset_required_fields():
@@ -11752,7 +11752,7 @@ def test_list_saved_queries_rest_required_fields(request_type=asset_service.List
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_list_saved_queries_rest_unset_required_fields():
@@ -11978,7 +11978,7 @@ def test_update_saved_query_rest_required_fields(request_type=asset_service.Upda
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_update_saved_query_rest_unset_required_fields():
@@ -12143,7 +12143,7 @@ def test_delete_saved_query_rest_required_fields(request_type=asset_service.Dele
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_delete_saved_query_rest_unset_required_fields():
@@ -12320,7 +12320,7 @@ def test_batch_get_effective_iam_policies_rest_required_fields(request_type=asse
                 ),
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_batch_get_effective_iam_policies_rest_unset_required_fields():
@@ -12445,7 +12445,7 @@ def test_analyze_org_policies_rest_required_fields(request_type=asset_service.An
                 ),
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_analyze_org_policies_rest_unset_required_fields():
@@ -12690,7 +12690,7 @@ def test_analyze_org_policy_governed_containers_rest_required_fields(request_typ
                 ),
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_analyze_org_policy_governed_containers_rest_unset_required_fields():
@@ -12935,7 +12935,7 @@ def test_analyze_org_policy_governed_assets_rest_required_fields(request_type=as
                 ),
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_analyze_org_policy_governed_assets_rest_unset_required_fields():

packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py

@@ -2405,7 +2405,7 @@ def test_generate_access_token_rest_required_fields(request_type=common.Generate
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_generate_access_token_rest_unset_required_fields():
@@ -2582,7 +2582,7 @@ def test_generate_id_token_rest_required_fields(request_type=common.GenerateIdTo
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_generate_id_token_rest_unset_required_fields():
@@ -2759,7 +2759,7 @@ def test_sign_blob_rest_required_fields(request_type=common.SignBlobRequest):
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_sign_blob_rest_unset_required_fields():
@@ -2934,7 +2934,7 @@ def test_sign_jwt_rest_required_fields(request_type=common.SignJwtRequest):
             expected_params = [
             ]
             actual_params = req.call_args.kwargs['params']
-            assert expected_params == actual_params
+            assert sorted(expected_params) == sorted(actual_params)
 
 
 def test_sign_jwt_rest_unset_required_fields():