Update test cases to support node expressions in sh:node

Author: mgberg

shacl12-test-suite/tests/core/node/node-001.ttl

@@ -17,9 +17,12 @@ ex:TestClass
   rdf:type sh:NodeShape ;
   rdfs:label "Test class" ;
   rdfs:subClassOf rdfs:Resource ;
-  sh:node [
-      sh:class ex:OtherClass ;
-    ] ;
+  # Only using an IRI Expression here because Core doesn't define interesting node expressions
+  sh:node ex:TestNodeShape ;
+.
+ex:TestNodeShape
+  rdf:type sh:NodeShape ;
+  sh:class ex:OtherClass ;
 .
 ex:ValidInstance
   rdf:type ex:OtherClass ;
@@ -46,6 +49,7 @@ ex:ValidInstance
           rdf:type sh:ValidationResult ;
           sh:focusNode ex:InvalidInstance ;
           sh:resultSeverity sh:Violation ;
+          sh:sourceConstraint ex:TestNodeShape ;
           sh:sourceConstraintComponent sh:NodeConstraintComponent ;
           sh:sourceShape ex:TestClass ;
           sh:value ex:InvalidInstance ;

shacl12-test-suite/tests/core/property/node-001.ttl

@@ -12,6 +12,20 @@ ex:Anon
   rdf:type ex:Person ;
   ex:firstName "Anon" ;
 .
+ex:AssignedToShape ;
+  rdf:type sh:NodeShape ;
+  rdfs:comment "All assignees must have an email and a last name." ;
+  sh:property [
+      sh:path ex:email ;
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+    ] ;
+  sh:property [
+      sh:path ex:lastName ;
+      sh:maxCount 1 ;
+      sh:minCount 1 ;
+    ] ;
+.
 ex:Issue
   rdf:type rdfs:Class ;
   rdf:type sh:NodeShape ;
@@ -23,19 +37,8 @@ ex:Issue
 ex:Issue-assignedTo
   sh:path ex:assignedTo ;
   sh:class ex:Person ;
-  sh:node [
-      rdfs:comment "All assignees must have an email and a last name." ;
-      sh:property [
-          sh:path ex:email ;
-          sh:maxCount 1 ;
-          sh:minCount 1 ;
-        ] ;
-      sh:property [
-          sh:path ex:lastName ;
-          sh:maxCount 1 ;
-          sh:minCount 1 ;
-        ] ;
-    ] ;
+  # Only using an IRI Expression here because Core doesn't define interesting node expressions
+  sh:node ex:AssignedToShape ;
 .
 ex:Issue-submittedBy
   sh:path ex:submittedBy ;
@@ -104,6 +107,7 @@ ex:Person
           sh:focusNode ex:Issue_1 ;
           sh:resultPath ex:assignedTo ;
           sh:resultSeverity sh:Violation ;
+          sh:sourceConstraint ex:AssignedToShape ;
           sh:sourceConstraintComponent sh:NodeConstraintComponent ;
           sh:sourceShape ex:Issue-assignedTo ;
           sh:value ex:Anon ;

shacl12-test-suite/tests/core/property/qualifiedValueShape-001.ttl

@@ -20,15 +20,17 @@ ex:APGARObservationShape-related
   sh:qualifiedValueShape [
       sh:property [
           sh:path ex:related_target ;
-          sh:node [
-              sh:property [
-                  sh:path ex:reference ;
-                  sh:hasValue ex:something ;
-                ] ;
-            ] ;
+          sh:node ex:NestedNodeShape ;
         ] ;
     ] ;
 .
+ex:NestedNodeShape
+  rdf:type sh:NodeShape ;
+  sh:property [
+      sh:path ex:reference ;
+      sh:hasValue ex:something ;
+    ] ;
+.
 ex:Observation1
   rdf:type ex:Observation ;
   ex:related [