add more tests

NREL · Feb 13, 2024 · fc784c0 · fc784c0
1 parent 2bd1976
commit fc784c0
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 6 deletions.
diff --git a/buildingmotif/dataclasses/shape_collection.py b/buildingmotif/dataclasses/shape_collection.py
@@ -336,14 +336,13 @@ def gensym():
     clauses += " UNION ".join(too_clauses)
 
     # handle targetNode
-    targetNode = graph.objects(shape, SH.targetNode)
-    if len(targetNode) > 1:
+    targetNode = list(graph.objects(shape, SH.targetNode))
+    if len(targetNode) == 1:
+        clauses += f"BIND({targetNode[0].n3()} AS ?target) .\n"
+    elif len(targetNode) > 1:
         raise ValueError(
-            "Cannot currently have more than one sh:targetNode in shacl-to-sparql conversion"
+            "More than one targetNode found. This is not currently supported"
         )
-    if targetNode:
-        targetNode = next(targetNode)
-        clauses += f"BIND({targetNode.n3()} AS ?target) .\n"
 
     # find all of the non-qualified property shapes. All of these will use the same variable
     # for all uses of the same sh:path value

diff --git a/tests/unit/dataclasses/test_shape_collection.py b/tests/unit/dataclasses/test_shape_collection.py
@@ -1,5 +1,6 @@
 import random
 
+import pytest
 import rdflib
 from rdflib import RDF, Graph, URIRef
 from rdflib.compare import isomorphic
@@ -160,3 +161,19 @@ def test_shape_to_query(clean_building_motif):
     )
     # assert this parses correctly
     g.query(query2)
+
+    # test that we handle multiple target nodes
+    with pytest.raises(ValueError):
+        sc.shape_to_query(URIRef("urn:shapes_to_query/multiple_targets"))
+
+    # handle targetSubjectsOf
+    query3 = sc.shape_to_query(URIRef("urn:shapes_to_query/subjectTarget"))
+    assert (
+        "?target <https://brickschema.org/schema/Brick#hasPoint> ?ignore ."
+    ) in query3, query3
+
+    # handle targetObjectsOf
+    query4 = sc.shape_to_query(URIRef("urn:shapes_to_query/objectTarget"))
+    assert (
+        "?ignore <https://brickschema.org/schema/Brick#hasPoint> ?target ."
+    ) in query4, query4
diff --git a/tests/unit/fixtures/shape_to_query/shapes.ttl b/tests/unit/fixtures/shape_to_query/shapes.ttl
@@ -45,3 +45,36 @@
         # optional
     ] ;
 .
+
+:multiple_targets a sh:NodeShape, owl:Class ;
+    sh:targetNode brick:ABC, brick:DEF ;
+    sh:property [
+        sh:name "sensor" ;
+        sh:path brick:hasPoint ;
+        sh:qualifiedValueShape [ sh:node :sensor ] ;
+        sh:qualifiedMaxCount 1 ;
+        sh:qualifiedMinCount 1 ;
+    ] ;
+.
+
+:subjectTarget a sh:NodeShape, owl:Class ;
+    sh:targetSubjectsOf brick:hasPoint ;
+    sh:property [
+        sh:name "sensor" ;
+        sh:path brick:hasPoint ;
+        sh:qualifiedValueShape [ sh:node :sensor ] ;
+        sh:qualifiedMaxCount 1 ;
+        sh:qualifiedMinCount 1 ;
+    ] ;
+.
+
+:objectTarget a sh:NodeShape, owl:Class ;
+    sh:targetObjectsOf brick:hasPoint ;
+    sh:property [
+        sh:name "equip" ;
+        sh:path brick:isPointOf ;
+        sh:qualifiedValueShape [ sh:node :vav ] ;
+        sh:qualifiedMaxCount 1 ;
+        sh:qualifiedMinCount 1 ;
+    ] ;
+.