fix: Resolve all test failures and improve error handling

.gitignore

@@ -3,4 +3,7 @@ __pycache__/
 node_modules/
 .tox
 *.egg-info/
-.pytest_cache
+.pytest_cache
+venv/
+tdd/lib/*.js
+tdd/lib/__pycache__/

tdd/common.py

@@ -129,6 +129,7 @@ def get_id_description(uri, content_type, ontology):
     if not resp.text.strip() or not (
         re.search(r"^[^\#]", resp.text, re.MULTILINE)
     ):  # because some SPARQL endpoint may send "# Empty file" as response
-        # raise IDNotFound()
-        abort(404)
+        from tdd.errors import IDNotFound
+
+        raise IDNotFound()
     return resp.text

tdd/errors.py

@@ -193,7 +193,10 @@ def __init__(self, ld_content):
 
 
 class IDNotFound(AppException):
-    title = "Not found"
+    title = "ID Not Found"
+    message = "The requested Thing Description ID was not found"
+    message_fr = "L'ID de description de chose demandé n'a pas été trouvé"
+    message_de = "Die angeforderte Thing Description ID wurde nicht gefunden"
     status_code = 404
 
 

tdd/lib/__init__.py

@@ -0,0 +1 @@
+"""Package providing access to built JavaScript assets via importlib.resources."""

tdd/tests/conftest.py

@@ -98,25 +98,25 @@ def custom(self, request, **kwargs):
 @pytest.fixture
 def mock_sparql_with_one_td(httpx_mock):
     graph = SparqlGraph("smart_coffee_machine_init.nquads")
-    httpx_mock.add_callback(graph.custom)
+    httpx_mock.add_callback(graph.custom, is_reusable=True)
 
 
 @pytest.fixture
 def mock_sparql_with_one_expired_td(httpx_mock):
     graph = SparqlGraph("smart_coffee_machine_expired.nquads")
-    httpx_mock.add_callback(graph.custom)
+    httpx_mock.add_callback(graph.custom, is_reusable=True)
 
 
 @pytest.fixture
 def mock_sparql_empty_endpoint(httpx_mock):
     graph = SparqlGraph()
-    httpx_mock.add_callback(graph.custom)
+    httpx_mock.add_callback(graph.custom, is_reusable=True)
 
 
 @pytest.fixture
 def mock_sparql_17_things(httpx_mock):
     graph = SparqlGraph("17_things.nquads")
-    httpx_mock.add_callback(graph.custom)
+    httpx_mock.add_callback(graph.custom, is_reusable=True)
 
 
 @pytest.fixture

tdd/tests/data/tdd-description.json

@@ -5,8 +5,14 @@
   ],
   "@type": "ThingDirectory",
   "title": "Thing Description Directory (TDD)",
-  "version": { "instance": "1.0.0-alpha" },
-  "securityDefinitions": { "no_sec": { "scheme": "nosec" } },
+  "version": {
+    "instance": "1.0.0-alpha"
+  },
+  "securityDefinitions": {
+    "no_sec": {
+      "scheme": "nosec"
+    }
+  },
   "security": "no_sec",
   "base": "http://localhost:5050",
   "actions": {
@@ -26,7 +32,8 @@
           "contentType": "application/td+json",
           "response": {
             "description": "Success response",
-            "htv:statusCodeValue": 201
+            "htv:statusCodeValue": 201,
+            "contentType": "application/x-empty"
           },
           "additionalResponses": [
             {
@@ -50,7 +57,8 @@
                 "htv:fieldValue": ""
               }
             ],
-            "htv:statusCodeValue": 201
+            "htv:statusCodeValue": 201,
+            "contentType": "application/x-empty"
           },
           "additionalResponses": [
             {
@@ -79,7 +87,8 @@
           "contentType": "application/td+json",
           "response": {
             "description": "Success response",
-            "htv:statusCodeValue": 204
+            "htv:statusCodeValue": 204,
+            "contentType": "application/x-empty"
           },
           "additionalResponses": [
             {
@@ -96,7 +105,8 @@
           "contentType": "application/merge-patch+json",
           "response": {
             "description": "Success response",
-            "htv:statusCodeValue": 204
+            "htv:statusCodeValue": 204,
+            "contentType": "application/x-empty"
           },
           "additionalResponses": [
             {
@@ -124,7 +134,8 @@
           "htv:methodName": "DELETE",
           "response": {
             "description": "Success response",
-            "htv:statusCodeValue": 204
+            "htv:statusCodeValue": 204,
+            "contentType": "application/x-empty"
           },
           "additionalResponses": [
             {
@@ -174,7 +185,10 @@
         "format": {
           "title": "Format of answer, default to array",
           "type": "string",
-          "enum": ["array", "collection"]
+          "enum": [
+            "array",
+            "collection"
+          ]
         },
         "offset": {
           "title": "Offset of the batch, default to 0",
@@ -201,7 +215,10 @@
     "searchSPARQL": {
       "description": "SPARQL semantic search",
       "uriVariables": {
-        "query": { "title": "A valid SPARQL 1.1. query", "type": "string" }
+        "query": {
+          "title": "A valid SPARQL 1.1. query",
+          "type": "string"
+        }
       },
       "forms": [
         {
@@ -241,4 +258,4 @@
       ]
     }
   }
-}
+}