Make OpenAPI resource count tests derive expectations dynamically

Author: Anonymous Committer

tests/test_codegen.py

@@ -14,6 +14,24 @@
 OVERRIDES_PATH = Path("openapi/sdk_overrides.yaml")
 
 
+def count_operations(spec: dict) -> int:
+    return sum(
+        1
+        for path_item in spec.get("paths", {}).values()
+        for method in path_item
+        if not method.startswith("x-")
+    )
+
+
+def collect_resource_namespaces(spec: dict) -> set[str]:
+    return {
+        operation["x-sdk-resource"]
+        for path_item in spec.get("paths", {}).values()
+        for method, operation in path_item.items()
+        if not method.startswith("x-")
+    }
+
+
 def test_normalize_spec_removes_token_and_adds_security_scheme():
     normalized = normalize_spec(
         load_json(RAW_SPEC_PATH), load_overrides(OVERRIDES_PATH)
@@ -33,10 +51,14 @@ def test_collect_resources_matches_expected_counts():
         load_json(RAW_SPEC_PATH), load_overrides(OVERRIDES_PATH)
     )
     resources = collect_resources(normalized)
+    expected_namespaces = collect_resource_namespaces(normalized)
 
-    assert len(resources) == 25
-    assert sum(len(resource.operations) for resource in resources) == 201
     namespace_set = {resource.namespace for resource in resources}
+    assert len(resources) == len(expected_namespaces)
+    assert sum(len(resource.operations) for resource in resources) == count_operations(
+        normalized
+    )
+    assert namespace_set == expected_namespaces
     assert {"douyin", "douyin_xingtu", "tiktok_shop", "xiaohongshu_pgy"}.issubset(
         namespace_set
     )

tests/test_generated_surface.py

@@ -1,16 +1,30 @@
 from __future__ import annotations
 
+from pathlib import Path
+
 from justoneapi import JustOneAPIClient
 from justoneapi.generated.models import Result
 from justoneapi.generated.resources import RESOURCE_CLASSES
+from tools.sdk_codegen import load_json
+
+NORMALIZED_SPEC_PATH = Path("openapi/public-api.normalized.json")
+
+
+def expected_resource_namespaces() -> set[str]:
+    spec = load_json(NORMALIZED_SPEC_PATH)
+    return {
+        operation["x-sdk-resource"]
+        for path_item in spec.get("paths", {}).values()
+        for method, operation in path_item.items()
+        if not method.startswith("x-")
+    }
 
 
 def test_generated_resource_registry_matches_public_api_surface():
-    assert len(RESOURCE_CLASSES) == 25
-    assert "douyin" in RESOURCE_CLASSES
-    assert "douyin_xingtu" in RESOURCE_CLASSES
-    assert "xiaohongshu_pgy" in RESOURCE_CLASSES
-    assert "twitter" in RESOURCE_CLASSES
+    assert set(RESOURCE_CLASSES) == expected_resource_namespaces()
+    assert {"douyin", "douyin_xingtu", "xiaohongshu_pgy", "twitter"}.issubset(
+        RESOURCE_CLASSES
+    )
 
 
 def test_client_exposes_generated_resources():