fixed coverage

Author: daniel-sanche

packages/google-api-core/google/api_core/path_template.py

@@ -143,18 +143,16 @@ def replacer(match):
         elif positional == "**":
             wildcard_types.append("**")
             return r"(.+)"
-        elif name is not None:
-            if not template or template == "*":
-                wildcard_types.append("*")
-                return r"([^/]+)"
-            elif template == "**":
-                wildcard_types.append("**")
-                return r"(.+)"
-            else:
-                sub_pattern, sub_types = _build_capture_pattern(template)
-                wildcard_types.extend(sub_types)
-                return sub_pattern.pattern
-        return match.group(0)
+        elif not template or template == "*":
+            wildcard_types.append("*")
+            return r"([^/]+)"
+        elif template == "**":
+            wildcard_types.append("**")
+            return r"(.+)"
+        else:
+            sub_pattern, sub_types = _build_capture_pattern(template)
+            wildcard_types.extend(sub_types)
+            return sub_pattern.pattern
 
     parts = []
     last_idx = 0
@@ -232,7 +230,7 @@ def _extract_and_validate_wildcards(
                 if captured_val in (".", ".."):
                     name_str = property_name if property_name else "positional variable"
                     raise ValueError("Invalid value {} for {}.".format(val, name_str))
-            elif wildcard_type == "**":
+            else:
                 if not _validate_multi_segment_value(captured_val):
                     name_str = property_name if property_name else "positional variable"
                     raise ValueError("Invalid value {} for {}.".format(val, name_str))

packages/google-api-core/tests/unit/test_path_template.py

@@ -764,7 +764,7 @@ def test_path_traversal_dots_validation_double_star_valid(name_val, expected_pat
     ],
 )
 def test_path_traversal_dots_validation_double_star_invalid(name_val):
-    with pytest.raises(ValueError, match="Invalid value .* for name\\."):
+    with pytest.raises(ValueError, match=r"Invalid value .* for name\."):
         path_template.expand(
             "/v3/{name=projects/*/monitoredResourceDescriptors/**}",
             name=name_val,
@@ -786,3 +786,29 @@ def test_percent_encoding_unreserved_characters(tmpl, kwargs, expected_result):
     # For single-segment with '/', validate should fail because '/' is preserved
     if "/" in kwargs.get("name", "") and tmpl == "/v1/{name}":
         assert not path_template.validate(tmpl, result)
+
+
+@pytest.mark.parametrize(
+    "tmpl, args, kwargs, expected_err_match",
+    [
+        ("/v1/**", [".."], {}, r"Invalid value .* for positional variable\."),
+        ("/v1/{name=**}", [], {"name": ".."}, r"Invalid value .* for name\."),
+    ],
+)
+def test_path_traversal_dots_validation_bare_double_star(tmpl, args, kwargs, expected_err_match):
+    with pytest.raises(ValueError, match=expected_err_match):
+        path_template.expand(tmpl, *args, **kwargs)
+
+@pytest.mark.parametrize(
+    "template_str, expected_pattern, expected_wildcards",
+    [
+        ("projects/{project}/locations/{location}", "projects/([^/]+)/locations/([^/]+)", ("*", "*")),
+        ("projects/{project=**}", "projects/(.+)", ("**",)),
+        ("projects/{project=locations/*}", "projects/locations/([^/]+)", ("*",)),
+        ("projects/*/locations/**", "projects/([^/]+)/locations/(.+)", ("*", "**")),
+    ],
+)
+def test_build_capture_pattern(template_str, expected_pattern, expected_wildcards):
+    pattern, wildcards = path_template._build_capture_pattern(template_str)
+    assert pattern.pattern == expected_pattern
+    assert wildcards == expected_wildcards