test fix/refactor

Author: tpellissier

src/dataverse_sdk/client.py

@@ -387,7 +387,8 @@ def get_table_info(self, logical_name: str) -> Optional[Dict[str, Any]]:
         Example:
             Retrieve table metadata::
 
-                info = client.get_table_info("new_sampleitem")                if info:
+                info = client.get_table_info("new_sampleitem")
+                if info:
                     print(f"Logical name: {info['entity_logical_name']}")
                     print(f"Entity set: {info['entity_set_name']}")
         """
@@ -407,6 +408,8 @@ def create_table(
         :type logical_name: str
         :param schema: Dictionary mapping column logical names (with prefix) to their types.
 
+            Supported types:
+
             - Primitive types: ``"string"``, ``"int"``, ``"decimal"``, ``"float"``, ``"datetime"``, ``"bool"``
             - Enum subclass (IntEnum preferred): Creates a local option set. Optional multilingual
               labels can be provided via ``__labels__`` class attribute, defined inside the Enum subclass::

tests/unit/core/test_http_errors.py

@@ -5,39 +5,13 @@
 from dataverse_sdk.core.errors import HttpError
 from dataverse_sdk.core import error_codes as ec
 from dataverse_sdk.data.odata import ODataClient
-
-class DummyAuth:
-    def acquire_token(self, scope):
-        class T: access_token = "x"
-        return T()
-
-class DummyHTTP:
-    def __init__(self, responses):
-        self._responses = responses
-    def request(self, method, url, **kwargs):
-        if not self._responses:
-            raise AssertionError("No more responses")
-        status, headers, body = self._responses.pop(0)
-        class R:
-            pass
-        r = R()
-        r.status_code = status
-        r.headers = headers
-        if isinstance(body, dict):
-            import json
-            r.text = json.dumps(body)
-            def json_func(): return body
-            r.json = json_func
-        else:
-            r.text = body or ""
-            def json_fail(): raise ValueError("non-json")
-            r.json = json_fail
-        return r
+from tests.unit.test_helpers import DummyAuth, DummyHTTPClient
 
 class TestClient(ODataClient):
+    """Test client for HTTP error testing."""
     def __init__(self, responses):
         super().__init__(DummyAuth(), "https://org.example", None)
-        self._http = DummyHTTP(responses)
+        self._http = DummyHTTPClient(responses)
 
 # --- Tests ---
 

tests/unit/data/test_enum_optionset_payload.py

@@ -5,22 +5,7 @@
 from enum import Enum, IntEnum
 
 from dataverse_sdk.data.odata import ODataClient
-
-class DummyAuth:
-    def acquire_token(self, scope):  # pragma: no cover - simple stub
-        class T:
-            access_token = "token"
-        return T()
-
-class DummyConfig:
-    """Minimal config stub providing attributes ODataClient.__init__ expects."""
-
-    def __init__(self, language_code=1033):
-        self.language_code = language_code
-        # HTTP settings referenced during ODataClient construction
-        self.http_retries = 0
-        self.http_backoff = 0
-        self.http_timeout = 5
+from tests.unit.test_helpers import DummyAuth, DummyConfig
 
 def _make_client(lang=1033):
     return ODataClient(DummyAuth(), "https://org.example", DummyConfig(language_code=lang))

tests/unit/data/test_logical_crud.py

@@ -1,69 +1,17 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
-import types
 import pytest
-from dataverse_sdk.data.odata import ODataClient
 from dataverse_sdk.core.errors import MetadataError
+from tests.unit.test_helpers import (
+    TestableClient,
+    MD_ACCOUNT,
+    make_entity_create_headers,
+    make_entity_metadata
+)
 
-class DummyAuth:
-    def acquire_token(self, scope):
-        class T: access_token = "x"
-        return T()
-
-class DummyHTTPClient:
-    def __init__(self, responses):
-        self._responses = responses
-        self.calls = []
-    def request(self, method, url, **kwargs):
-        self.calls.append((method, url, kwargs))
-        if not self._responses:
-            raise AssertionError("No more dummy responses configured")
-        status, headers, body = self._responses.pop(0)
-        resp = types.SimpleNamespace()
-        resp.status_code = status
-        resp.headers = headers
-        resp.text = "" if body is None else ("{}" if isinstance(body, dict) else str(body))
-        def raise_for_status():
-            if status >= 400:
-                raise RuntimeError(f"HTTP {status}")
-            return None
-        def json_func():
-            return body if isinstance(body, dict) else {}
-        resp.raise_for_status = raise_for_status
-        resp.json = json_func
-        return resp
-
-class TestableClient(ODataClient):
-    def __init__(self, responses):
-        super().__init__(DummyAuth(), "https://org.example", None)
-        self._http = DummyHTTPClient(responses)
-    def _convert_labels_to_ints(self, logical_name, record):  # pragma: no cover - test shim
-        return record
-
-# Helper metadata response for logical name resolution
-MD_ACCOUNT = {
-    "value": [
-        {
-            "LogicalName": "account",
-            "EntitySetName": "accounts",
-            "PrimaryIdAttribute": "accountid"
-        }
-    ]
-}
-
-MD_SAMPLE = {
-    "value": [
-        {
-            "LogicalName": "new_sampleitem",
-            "EntitySetName": "new_sampleitems",
-            "PrimaryIdAttribute": "new_sampleitemid"
-        }
-    ]
-}
-
-def make_entity_create_headers(entity_set, guid):
-    return {"OData-EntityId": f"https://org.example/api/data/v9.2/{entity_set}({guid})"}
+# Additional metadata for this test file
+MD_SAMPLE = make_entity_metadata("new_sampleitem", "new_sampleitems", "new_Sampleitem", "new_sampleitemid")
 
 
 def test_single_create_update_delete_get():

tests/unit/data/test_naming_normalization.py

@@ -8,86 +8,19 @@
 and unified metadata cache introduced for explicit naming enforcement.
 """
 
-import types
 import pytest
-from dataverse_sdk.data.odata import ODataClient
 from dataverse_sdk.core.errors import MetadataError
-
-
-class DummyAuth:
-    """Mock authentication for testing."""
-    def acquire_token(self, scope):
-        class T:
-            access_token = "test_token"
-        return T()
-
-
-class DummyHTTPClient:
-    """Mock HTTP client that returns pre-configured responses."""
-    def __init__(self, responses):
-        self._responses = responses
-        self.calls = []
-    
-    def request(self, method, url, **kwargs):
-        self.calls.append((method, url, kwargs))
-        if not self._responses:
-            raise AssertionError("No more dummy responses configured")
-        status, headers, body = self._responses.pop(0)
-        resp = types.SimpleNamespace()
-        resp.status_code = status
-        resp.headers = headers
-        resp.text = "" if body is None else ("{}" if isinstance(body, dict) else str(body))
-        
-        def raise_for_status():
-            if status >= 400:
-                raise RuntimeError(f"HTTP {status}")
-            return None
-        
-        def json_func():
-            return body if isinstance(body, dict) else {}
-        
-        resp.raise_for_status = raise_for_status
-        resp.json = json_func
-        return resp
-
-
-class TestableClient(ODataClient):
-    """ODataClient with mocked HTTP for testing."""
-    def __init__(self, responses):
-        super().__init__(DummyAuth(), "https://org.example", None)
-        self._http = DummyHTTPClient(responses)
-    
-    def _convert_labels_to_ints(self, logical_name, record):
-        """Test shim - no-op conversion."""
-        return record
-
+from tests.unit.test_helpers import (
+    TestableClient,
+    MD_ACCOUNT,
+    MD_SAMPLE_ITEM,
+    make_entity_create_headers
+)
 
 # ============================================================================
-# Test Data - Metadata Responses
+# Test Data - Additional Metadata Responses for this test file
 # ============================================================================
 
-MD_SAMPLE_ITEM = {
-    "value": [
-        {
-            "LogicalName": "new_sampleitem",
-            "EntitySetName": "new_sampleitems",
-            "SchemaName": "new_Sampleitem",
-            "PrimaryIdAttribute": "new_sampleitemid"
-        }
-    ]
-}
-
-MD_ACCOUNT = {
-    "value": [
-        {
-            "LogicalName": "account",
-            "EntitySetName": "accounts",
-            "SchemaName": "Account",
-            "PrimaryIdAttribute": "accountid"
-        }
-    ]
-}
-
 MD_ENTITY_BY_LOGICAL = {
     "LogicalName": "new_sampleitem",
     "EntitySetName": "new_sampleitems",