revert changes

Author: ohmayr

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

@@ -2382,27 +2382,26 @@ def test_{{ service.name|snake_case }}_grpc_lro_client():
 {% endif %} {# if grpc in opts #}
 
 {% with molluscs = cycler("squid", "clam", "whelk", "octopus", "oyster", "nudibranch", "cuttlefish", "mussel", "winkle", "nautilus", "scallop", "abalone") %}
-{% for message in service.resource_messages %}
-{% set method_base_name = service.resource_path_method_names[message.resource_type_full_path] %}
-def test_{{ method_base_name }}_path():
+{% for message in service.resource_messages|sort(attribute="resource_type") %}
+def test_{{ message.resource_type|snake_case }}_path():
     {% for arg in message.resource_path_args %}
     {{ arg }} = "{{ molluscs.next() }}"
     {% endfor %}
     expected = "{{ message.resource_path_formatted }}".format({% for arg in message.resource_path_args %}{{ arg }}={{ arg }}, {% endfor %})
-    actual = {{ service.client_name }}.{{ method_base_name }}_path({{message.resource_path_args|join(", ") }})
+    actual = {{ service.client_name }}.{{ message.resource_type|snake_case }}_path({{message.resource_path_args|join(", ") }})
     assert expected == actual
 
 
-def test_parse_{{ method_base_name }}_path():
+def test_parse_{{ message.resource_type|snake_case }}_path():
     expected = {
     {% for arg in message.resource_path_args %}
         "{{ arg }}": "{{ molluscs.next() }}",
     {% endfor %}
     }
-    path = {{ service.client_name }}.{{ method_base_name }}_path(**expected)
+    path = {{ service.client_name }}.{{ message.resource_type|snake_case }}_path(**expected)
 
     # Check that the path construction is reversible.
-    actual = {{ service.client_name }}.parse_{{ method_base_name }}_path(path)
+    actual = {{ service.client_name }}.parse_{{ message.resource_type|snake_case }}_path(path)
     assert expected == actual
 
 {% endfor %}

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

@@ -1788,27 +1788,26 @@ def test_{{ service.name|snake_case }}_grpc_lro_async_client():
 {% endif %} {# if grpc in opts #}
 
 {% with molluscs = cycler("squid", "clam", "whelk", "octopus", "oyster", "nudibranch", "cuttlefish", "mussel", "winkle", "nautilus", "scallop", "abalone") %}
-{% for message in service.resource_messages %}
-{% set method_base_name = service.resource_path_method_names[message.resource_type_full_path] %}
-def test_{{ method_base_name }}_path():
+{% for message in service.resource_messages|sort(attribute="resource_type") %}
+def test_{{ message.resource_type|snake_case }}_path():
     {% for arg in message.resource_path_args %}
     {{ arg }} = "{{ molluscs.next() }}"
     {% endfor %}
     expected = "{{ message.resource_path_formatted }}".format({% for arg in message.resource_path_args %}{{ arg }}={{ arg }}, {% endfor %})
-    actual = {{ service.client_name }}.{{ method_base_name }}_path({{message.resource_path_args|join(", ") }})
+    actual = {{ service.client_name }}.{{ message.resource_type|snake_case }}_path({{message.resource_path_args|join(", ") }})
     assert expected == actual
 
 
-def test_parse_{{ method_base_name }}_path():
+def test_parse_{{ message.resource_type|snake_case }}_path():
     expected = {
     {% for arg in message.resource_path_args %}
         "{{ arg }}": "{{ molluscs.next() }}",
     {% endfor %}
     }
-    path = {{ service.client_name }}.{{ method_base_name }}_path(**expected)
+    path = {{ service.client_name }}.{{ message.resource_type|snake_case }}_path(**expected)
 
     # Check that the path construction is reversible.
-    actual = {{ service.client_name }}.parse_{{ method_base_name }}_path(path)
+    actual = {{ service.client_name }}.parse_{{ message.resource_type|snake_case }}_path(path)
     assert expected == actual
 
 {% endfor %}