test: use BoundModelTestCase for zones api

Author: jooola

hcloud/zones/client.py

@@ -352,7 +352,7 @@ def update_rrset(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.update_rrset(rrset, labels=labels)
+        return self._client.update_rrset(rrset=rrset, labels=labels)
 
     def delete_rrset(
         self,
@@ -369,7 +369,7 @@ def delete_rrset(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.delete_rrset(rrset)
+        return self._client.delete_rrset(rrset=rrset)
 
     def change_rrset_protection(
         self,
@@ -389,7 +389,7 @@ def change_rrset_protection(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.change_rrset_protection(rrset, change=change)
+        return self._client.change_rrset_protection(rrset=rrset, change=change)
 
     def change_rrset_ttl(
         self,
@@ -408,7 +408,7 @@ def change_rrset_ttl(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.change_rrset_ttl(rrset, ttl=ttl)
+        return self._client.change_rrset_ttl(rrset=rrset, ttl=ttl)
 
     def add_rrset_records(
         self,
@@ -429,7 +429,7 @@ def add_rrset_records(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.add_rrset_records(rrset, records=records, ttl=ttl)
+        return self._client.add_rrset_records(rrset=rrset, records=records, ttl=ttl)
 
     def remove_rrset_records(
         self,
@@ -448,7 +448,7 @@ def remove_rrset_records(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.remove_rrset_records(rrset, records=records)
+        return self._client.remove_rrset_records(rrset=rrset, records=records)
 
     def set_rrset_records(
         self,
@@ -467,7 +467,7 @@ def set_rrset_records(
             DNS API is in beta, breaking changes may occur within minor releases.
             See https://docs.hetzner.cloud/changelog#2025-10-07-dns-beta for more details.
         """
-        return self._client.set_rrset_records(rrset, records=records)
+        return self._client.set_rrset_records(rrset=rrset, records=records)
 
 
 class BoundZoneRRSet(BoundModelBase, ZoneRRSet):

tests/unit/conftest.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import inspect
-from typing import Callable, ClassVar
+from typing import Callable, ClassVar, TypedDict
 from unittest import mock
 
 import pytest
@@ -166,13 +166,20 @@ def pytest_generate_tests(metafunc: pytest.Metafunc):
         metafunc.parametrize("bound_model_method", metafunc.cls.methods)
 
 
+class BoundModelTestOptions(TypedDict):
+    sub_resource: bool
+
+
 class BoundModelTestCase:
-    methods: ClassVar[list[Callable]]
+    methods: ClassVar[list[Callable | tuple[Callable, BoundModelTestOptions]]]
 
     def test_method_list(self, bound_model):
         """
         Ensure the list of bound model methods is up to date.
         """
+        # Unpack methods
+        methods = [m[0] if isinstance(m, tuple) else m for m in self.__class__.methods]
+
         members_count = 0
         members_missing = []
         for name, member in inspect.getmembers(
@@ -184,7 +191,7 @@ def test_method_list(self, bound_model):
             if name in ("__init__", "get_actions", "get_actions_list"):
                 continue
 
-            if member.__func__ in self.__class__.methods:
+            if member.__func__ in methods:
                 members_count += 1
             else:
                 members_missing.append(member.__func__.__qualname__)
@@ -196,8 +203,12 @@ def test_method(
         self,
         resource_client,
         bound_model,
-        bound_model_method: Callable,
+        bound_model_method: Callable | tuple[Callable, BoundModelTestOptions],
     ):
+        options = BoundModelTestOptions()
+        if isinstance(bound_model_method, tuple):
+            bound_model_method, options = bound_model_method
+
         # Check if the resource client has a method named after the bound model method.
         assert hasattr(resource_client, bound_model_method.__name__)
 
@@ -214,6 +225,9 @@ def test_method(
         # Call the bound model method
         result = getattr(bound_model, bound_model_method.__name__)(**kwargs)
 
-        resource_client_method_mock.assert_called_with(bound_model, **kwargs)
+        if options.get("sub_resource"):
+            resource_client_method_mock.assert_called_with(**kwargs)
+        else:
+            resource_client_method_mock.assert_called_with(bound_model, **kwargs)
 
         assert result is resource_client_method_mock.return_value

tests/unit/zones/test_client.py

@@ -19,7 +19,7 @@
     ZonesClient,
 )
 
-from ..conftest import assert_bound_action1
+from ..conftest import BoundModelTestCase, assert_bound_action1
 
 
 def assert_bound_zone1(o: BoundZone, client: ZonesClient):
@@ -847,13 +847,35 @@ def test_set_rrset_records(
         assert_bound_action1(action, resource_client._parent.actions)
 
 
-class TestBoundZone:
+class TestBoundZone(BoundModelTestCase):
+    methods = [
+        BoundZone.update,
+        BoundZone.delete,
+        BoundZone.import_zonefile,
+        BoundZone.export_zonefile,
+        BoundZone.change_primary_nameservers,
+        BoundZone.change_ttl,
+        BoundZone.change_protection,
+        BoundZone.get_rrset_all,
+        BoundZone.get_rrset_list,
+        BoundZone.get_rrset,
+        BoundZone.create_rrset,
+        # With rrset sub resource
+        (BoundZone.update_rrset, {"sub_resource": True}),
+        (BoundZone.delete_rrset, {"sub_resource": True}),
+        (BoundZone.change_rrset_protection, {"sub_resource": True}),
+        (BoundZone.change_rrset_ttl, {"sub_resource": True}),
+        (BoundZone.add_rrset_records, {"sub_resource": True}),
+        (BoundZone.remove_rrset_records, {"sub_resource": True}),
+        (BoundZone.set_rrset_records, {"sub_resource": True}),
+    ]
+
     @pytest.fixture()
     def resource_client(self, client: Client):
         return client.zones
 
     @pytest.fixture()
-    def bound_model(self, resource_client, zone1):
+    def bound_model(self, resource_client: ZonesClient, zone1):
         return BoundZone(resource_client, data=zone1)
 
     def test_init(self, resource_client: ZonesClient, bound_model: BoundZone):
@@ -898,13 +920,23 @@ def test_init(self, resource_client: ZonesClient, bound_model: BoundZone):
         assert o.registrar == "hetzner"
 
 
-class TestBoundZoneRRSet:
+class TestBoundZoneRRSet(BoundModelTestCase):
+    methods = [
+        BoundZoneRRSet.update_rrset,
+        BoundZoneRRSet.delete_rrset,
+        BoundZoneRRSet.change_rrset_protection,
+        BoundZoneRRSet.change_rrset_ttl,
+        BoundZoneRRSet.add_rrset_records,
+        BoundZoneRRSet.remove_rrset_records,
+        BoundZoneRRSet.set_rrset_records,
+    ]
+
     @pytest.fixture()
     def resource_client(self, client: Client):
         return client.zones
 
     @pytest.fixture()
-    def bound_model(self, resource_client, zone_rrset1):
+    def bound_model(self, resource_client: ZonesClient, zone_rrset1):
         return BoundZoneRRSet(resource_client, data=zone_rrset1)
 
     def test_init(self, resource_client: ZonesClient, bound_model: BoundZoneRRSet):