Changes to unit tests to reflect the stricter requirements on @id values needed to support openMINDS Collections

(which may have local ids starting with `_:`)

Author: apdavison

test/test_client.py

@@ -211,8 +211,9 @@ def test_create_new_instance(kg_client, mocker):
         "create_new_with_id",
         lambda **kw: MockKGResponse({**kw["payload"], **{"@id": kw["instance_id"]}}),
     )
-    response = kg_client.create_new_instance({"a": 1, "b": 2}, instance_id="some-id", space="not-a-real-space")
-    assert response == {"@id": "some-id", "a": 1, "b": 2}
+    fake_id = "00000000-0000-0000-0000-000000000000"
+    response = kg_client.create_new_instance({"a": 1, "b": 2}, instance_id=fake_id, space="not-a-real-space")
+    assert response == {"@id": fake_id, "a": 1, "b": 2}
 
 
 @skip_if_no_connection
@@ -222,12 +223,14 @@ def test_replace_instance(kg_client, mocker):
         "contribute_to_full_replacement",
         lambda **kw: MockKGResponse({**kw["payload"], **{"@id": kw["instance_id"]}}),
     )
-    response = kg_client.replace_instance("some-id", {"a": 1, "b": 2})
-    assert response == {"@id": "some-id", "a": 1, "b": 2}
+    fake_id = "00000000-0000-0000-0000-000000000000"
+    response = kg_client.replace_instance(fake_id, {"a": 1, "b": 2})
+    assert response == {"@id": fake_id, "a": 1, "b": 2}
 
 
 @skip_if_no_connection
 def test_delete_instance(kg_client, mocker):
     mocker.patch.object(kg_client._kg_client.instances, "delete")
-    response = kg_client.delete_instance("some-id")
-    kg_client._kg_client.instances.delete.assert_called_once_with("some-id")
+    fake_id = "00000000-0000-0000-0000-000000000000"
+    response = kg_client.delete_instance(fake_id)
+    kg_client._kg_client.instances.delete.assert_called_once_with(fake_id)

test/test_openminds_core.py

@@ -596,7 +596,7 @@ def test_save_new_mock(mock_client):
 def test_save_existing_mock(mock_client):
     timestamp = datetime.now()
     new_model = omcore.Model(
-        id="0000",
+        id="http://example.org/00000000-0000-0000-0000-000000000000",
         name=f"Dummy new model created for testing at {timestamp}",
         alias=f"DummyModel-{timestamp.isoformat()}",
         abstraction_level=omterms.ModelAbstractionLevel.by_name("protein structure", mock_client),
@@ -627,7 +627,7 @@ def test_save_existing_mock(mock_client):
 def test_save_existing_mock_no_updates_allowed(mock_client):
     timestamp = datetime.now()
     new_model = omcore.Model(
-        id="0000",
+        id="http://example.org/00000000-0000-0000-0000-000000000000",
         name=f"Dummy new model created for testing at {timestamp}",
         alias=f"DummyModel-{timestamp.isoformat()}",
         abstraction_level=omterms.ModelAbstractionLevel.by_name("protein structure", mock_client),
@@ -659,7 +659,7 @@ def test_save_existing_mock_no_updates_allowed(mock_client):
 def test_save_replace_existing_mock(mock_client):
     timestamp = datetime.now()
     new_model = omcore.Model(
-        id="0000",
+        id="http://example.org/00000000-0000-0000-0000-000000000000",
         name=f"Dummy new model created for testing at {timestamp}",
         alias=f"DummyModel-{timestamp.isoformat()}",
         abstraction_level=omterms.ModelAbstractionLevel.by_name("protein structure", mock_client),

test/test_utility.py

@@ -71,7 +71,7 @@ def test_sha1sum():
 
 def test_normalize_data():
     data = {
-        "@id": "0000",
+        "@id": "http://example.org/00000000-0000-0000-0000-000000000000",
         "@type": "https://openminds.ebrains.eu/core/Person",
         "affiliation": {
             "@type": "https://openminds.ebrains.eu/core/Affiliation",
@@ -85,7 +85,7 @@ def test_normalize_data():
     }
     context = {"@vocab": "https://openminds.ebrains.eu/vocab/"}
     expected = {
-        "@id": "0000",
+        "@id": "http://example.org/00000000-0000-0000-0000-000000000000",
         "@type": "https://openminds.ebrains.eu/core/Person",
         "https://openminds.ebrains.eu/vocab/affiliation": {
             "@type": "https://openminds.ebrains.eu/core/Affiliation",

test/utils.py

@@ -74,8 +74,9 @@ def instance_from_full_uri(
         release_status: str = "released",
         require_full_data: bool = True,
     ):
-        if uri == "0000":
-            return {"@id": "0000", "@type": ["https://openminds.om-i.org/types/Model"]}
+        mock_id = "http://example.org/00000000-0000-0000-0000-000000000000"
+        if uri == mock_id:
+            return {"@id": mock_id, "@type": ["https://openminds.om-i.org/types/Model"]}
         else:
             raise NotImplementedError