fix: add tests for review

Author: uwzm

tests/conftest.py

@@ -2,11 +2,16 @@
 import subprocess
 import time
 import requests
+import os
 
 from frost_sta_client.service.sensorthingsservice import SensorThingsService
 
 @pytest.fixture(scope='session')
 def frost_server():
+    if os.environ.get('RUN_INTEGRATION') != '1':
+        # Skip starting server if not requested
+        yield
+        return
     # Start FROST-Server using Podman
     subprocess.run(['podman', 'compose', '-f', 'frost_server/docker-compose.yaml', 'up', '-d'])
     # Wait for server to start
@@ -21,7 +26,7 @@ def frost_server():
     else:
         raise RuntimeError('FROST-Server failed to start')
     yield
-    subprocess.run(['podman', 'compose', '-f', '../frost_server/docker-compose.yaml', 'down'])
+    subprocess.run(['podman', 'compose', '-f', 'frost_server/docker-compose.yaml', 'down'])
 
 @pytest.fixture
 def sensorthings_service(frost_server):

tests/test_dao_base.py

@@ -0,0 +1,71 @@
+import pytest
+import requests
+from frost_sta_client.service.sensorthingsservice import SensorThingsService
+from frost_sta_client.model.thing import Thing
+
+
+class MockResponse:
+    def __init__(self, status_code=200, json_data=None, headers=None):
+        self.status_code = status_code
+        self._json = json_data if json_data is not None else {}
+        self.headers = headers or {}
+
+    def json(self):
+        return self._json
+
+    def raise_for_status(self):
+        if self.status_code >= 400:
+            raise requests.exceptions.HTTPError(response=self)
+
+
+class DummyService(SensorThingsService):
+    def __init__(self):
+        super().__init__('http://example.org/FROST-Server/v1.1')
+        self.calls = []
+
+    def execute(self, method, url, **kwargs):
+        self.calls.append((method, str(url), kwargs))
+        if method == 'post':
+            return MockResponse(201, {}, headers={'location': 'Things(42)'})
+        if method == 'get':
+            return MockResponse(200, {"@iot.id": 5, "name": "MyThing"})
+        return MockResponse(200, {})
+
+
+def test_base_dao_create_sets_id_and_service():
+    svc = DummyService()
+    t = Thing(name='X')
+    svc.create(t)
+    assert t.id == 42
+    assert t.service is svc
+
+
+def test_base_dao_find_returns_entity():
+    svc = DummyService()
+    found = svc.things().find(5)
+    assert found.id == 5
+    assert found.name == 'MyThing'
+    assert found.service is svc
+
+
+def test_base_dao_update_without_id_raises():
+    svc = DummyService()
+    t = Thing(name='noid')
+    with pytest.raises(AttributeError):
+        svc.update(t)
+
+
+def test_base_dao_patch_validates_and_sends_headers():
+    svc = DummyService()
+    t = Thing(id=7)
+    patches = [{"op": "replace", "path": "/name", "value": "new"}]
+    svc.patch(t, patches)
+    method, url, kwargs = svc.calls[-1]
+    assert method == 'patch'
+    assert kwargs['headers']['Content-type'] == 'application/json-patch+json'
+
+
+def test_entity_path_formats_string_and_int():
+    svc = DummyService()
+    assert svc.things().entity_path(1) == 'Things(1)'
+    assert svc.things().entity_path('abc') == "Things('abc')"

tests/test_entity_behaviour.py

@@ -0,0 +1,21 @@
+from frost_sta_client.service.sensorthingsservice import SensorThingsService
+from frost_sta_client.model.thing import Thing
+from frost_sta_client.model.location import Location
+from frost_sta_client.model.ext.entity_list import EntityList
+from frost_sta_client.model.ext.entity_type import EntityTypes
+
+
+def test_entity_equality_by_id():
+    a = Thing(id=1, name='A')
+    b = Thing(id=1, name='B')
+    assert a == b
+
+
+def test_set_service_propagates_to_children():
+    t = Thing(name='T')
+    loc = Location(name='L')
+    t.locations = EntityList(entity_class=EntityTypes['Location']['class'], entities=[loc])
+    svc = SensorThingsService('http://example.org/FROST-Server/v1.1')
+    t.set_service(svc)
+    assert t.service is svc
+    assert t.locations.entities[0].service is svc

tests/test_entity_list.py

@@ -0,0 +1,50 @@
+from frost_sta_client.utils import transform_json_to_entity_list
+from frost_sta_client.service.sensorthingsservice import SensorThingsService
+
+
+class MockResponse:
+    def __init__(self, json_data):
+        self._json = json_data
+        self.status_code = 200
+
+    def json(self):
+        return self._json
+
+    def raise_for_status(self):
+        pass
+
+
+class DummyService(SensorThingsService):
+    def __init__(self, url, page2):
+        super().__init__(url)
+        self.page2 = page2
+        self.calls = 0
+
+    def execute(self, method, url, **kwargs):
+        self.calls += 1
+        return MockResponse(self.page2)
+
+
+def test_entity_list_iterates_across_pages():
+    page1 = {
+        "value": [
+            {"@iot.id": 1, "name": "A"},
+            {"@iot.id": 2, "name": "B"},
+        ],
+        "@iot.nextLink": "http://example.org/FROST-Server/v1.1/Things?$skip=2"
+    }
+    page2 = {
+        "value": [
+            {"@iot.id": 3, "name": "C"},
+            {"@iot.id": 4, "name": "D"},
+        ]
+    }
+    elist = transform_json_to_entity_list(page1, 'frost_sta_client.model.thing.Thing')
+    svc = DummyService('http://example.org/FROST-Server/v1.1', page2)
+    elist.set_service(svc)
+    called = []
+    elist.step_size = 2
+    elist.callback = lambda idx: called.append(idx)
+    names = [e.name for e in elist]
+    assert names == ['A', 'B', 'C', 'D']
+    assert called == [0, 2]