Improve test cases

Author: strawgate

key-value/key-value-aio/src/key_value/aio/stores/memory/store.py

@@ -53,7 +53,7 @@ def _memory_cache_ttu(_key: Any, value: MemoryCacheEntry, now: float) -> float:
     return float(expiration_epoch)
 
 
-def _memory_cache_getsizeof(value: MemoryCacheEntry) -> int:  # pyright: ignore[reportUnusedParameter]  # noqa: ARG001
+def _memory_cache_getsizeof(value: MemoryCacheEntry) -> int:  # pyright: ignore[reportUnusedParameter]
     """Return size of cache entry (always 1 for entry counting)."""
     return 1
 

key-value/key-value-aio/tests/stores/base.py

@@ -9,12 +9,11 @@
 from key_value.shared.code_gen.sleep import asleep
 from key_value.shared.errors import InvalidTTLError, SerializationError
 from key_value.shared_test.cases import (
-    LARGE_TEST_DATA_ARGNAMES,
-    LARGE_TEST_DATA_ARGVALUES,
-    LARGE_TEST_DATA_IDS,
-    SIMPLE_TEST_DATA_ARGNAMES,
-    SIMPLE_TEST_DATA_ARGVALUES,
-    SIMPLE_TEST_DATA_IDS,
+    LARGE_DATA_CASES,
+    NEGATIVE_SIMPLE_CASES,
+    SIMPLE_CASES,
+    NegativeCases,
+    PositiveCases,
 )
 from pydantic import AnyHttpUrl
 
@@ -50,40 +49,27 @@ async def test_put_serialization_errors(self, store: BaseStore):
         with pytest.raises(SerializationError):
             await store.put(collection="test", key="test", value={"test": AnyHttpUrl("https://test.com")})
 
-    @pytest.mark.parametrize(
-        "name,value",
-        [
-            ("datetime", __import__("datetime").datetime.now(__import__("datetime").timezone.utc)),
-            ("date", __import__("datetime").date(2025, 1, 1)),
-            ("time", __import__("datetime").time(12, 0, 0)),
-            ("uuid", __import__("uuid").UUID("12345678-1234-5678-1234-567812345678")),
-            ("bytes", b"hello world"),
-            ("tuple", (1, 2, 3)),
-            ("set", {1, 2, 3}),
-            ("function", lambda x: x),
-            ("type", type("TestClass", (), {})),
-        ],
-        ids=["datetime", "date", "time", "uuid", "bytes", "tuple", "set", "function", "type"],
-    )
-    async def test_put_nonserializable_types(self, store: BaseStore, name: str, value: Any):  # pyright: ignore[reportUnusedParameter] # noqa: ARG002
-        """Tests that non-JSON-serializable Python types raise SerializationError."""
-        with pytest.raises(SerializationError):
-            await store.put(collection="test", key="test", value={"test": value})
-
     async def test_get_put_get(self, store: BaseStore):
         assert await store.get(collection="test", key="test") is None
         await store.put(collection="test", key="test", value={"test": "test"})
         assert await store.get(collection="test", key="test") == {"test": "test"}
 
-    @pytest.mark.parametrize(argnames=SIMPLE_TEST_DATA_ARGNAMES, argvalues=SIMPLE_TEST_DATA_ARGVALUES, ids=SIMPLE_TEST_DATA_IDS)
-    async def test_get_complex_put_get(self, store: BaseStore, data: dict[str, Any], json: str):  # pyright: ignore[reportUnusedParameter, reportUnusedParameter]  # noqa: ARG002
+    @PositiveCases.parametrize(cases=SIMPLE_CASES)
+    async def test_models_put_get(self, store: BaseStore, data: dict[str, Any], json: str, round_trip: dict[str, Any]):  # pyright: ignore[reportUnusedParameter, reportUnusedParameter]  # noqa: ARG002
         await store.put(collection="test", key="test", value=data)
-        assert await store.get(collection="test", key="test") == data
+        retrieved_data = await store.get(collection="test", key="test")
+        assert retrieved_data is not None
+        assert retrieved_data == round_trip
+
+    @NegativeCases.parametrize(cases=NEGATIVE_SIMPLE_CASES)
+    async def test_negative_models_put_get(self, store: BaseStore, data: dict[str, Any], error: type[Exception]):  # pyright: ignore[reportUnusedParameter, reportUnusedParameter]
+        with pytest.raises(error):
+            await store.put(collection="test", key="test", value=data)
 
-    @pytest.mark.parametrize(argnames=LARGE_TEST_DATA_ARGNAMES, argvalues=LARGE_TEST_DATA_ARGVALUES, ids=LARGE_TEST_DATA_IDS)
-    async def test_get_large_put_get(self, store: BaseStore, data: dict[str, Any], json: str):  # pyright: ignore[reportUnusedParameter, reportUnusedParameter]  # noqa: ARG002
+    @PositiveCases.parametrize(cases=[LARGE_DATA_CASES])
+    async def test_get_large_put_get(self, store: BaseStore, data: dict[str, Any], json: str, round_trip: dict[str, Any]):  # pyright: ignore[reportUnusedParameter, reportUnusedParameter]  # noqa: ARG002
         await store.put(collection="test", key="test", value=data)
-        assert await store.get(collection="test", key="test") == data
+        assert await store.get(collection="test", key="test") == round_trip
 
     async def test_put_many_get(self, store: BaseStore):
         await store.put_many(collection="test", keys=["test", "test_2"], values=[{"test": "test"}, {"test": "test_2"}])

key-value/key-value-aio/tests/stores/keyring/test_keyring.py

@@ -1,7 +1,6 @@
 from typing import Any
 
 import pytest
-from key_value.shared_test.cases import LARGE_TEST_DATA_ARGNAMES, LARGE_TEST_DATA_ARGVALUES, LARGE_TEST_DATA_IDS
 from typing_extensions import override
 
 from key_value.aio.stores.base import BaseStore
@@ -28,7 +27,6 @@ async def test_not_unbounded(self, store: BaseStore): ...
 
     @override
     @pytest.mark.skipif(condition=detect_on_windows(), reason="Keyrings do not support large values on Windows")
-    @pytest.mark.parametrize(argnames=LARGE_TEST_DATA_ARGNAMES, argvalues=LARGE_TEST_DATA_ARGVALUES, ids=LARGE_TEST_DATA_IDS)
     async def test_get_large_put_get(self, store: BaseStore, data: dict[str, Any], json: str):
         await store.put(collection="test", key="test", value=data)
         assert await store.get(collection="test", key="test") == data

key-value/key-value-aio/tests/stores/windows_registry/test_windows_registry.py

@@ -1,7 +1,6 @@
 from typing import TYPE_CHECKING, Any
 
 import pytest
-from key_value.shared_test.cases import LARGE_TEST_DATA_ARGNAMES, LARGE_TEST_DATA_ARGVALUES, LARGE_TEST_DATA_IDS
 from typing_extensions import override
 
 from key_value.aio.stores.base import BaseStore
@@ -31,7 +30,6 @@ async def store(self) -> "WindowsRegistryStore":
     async def test_not_unbounded(self, store: BaseStore): ...
 
     @override
-    @pytest.mark.parametrize(argnames=LARGE_TEST_DATA_ARGNAMES, argvalues=LARGE_TEST_DATA_ARGVALUES, ids=LARGE_TEST_DATA_IDS)
     async def test_get_large_put_get(self, store: BaseStore, data: dict[str, Any], json: str):
         await store.put(collection="test", key="test", value=data)
         assert await store.get(collection="test", key="test") == data