clean up sign-off instrument check

Author: douglowe

rocrate_validator/profiles/five-safes-crate/should/4_sign_off.ttl

@@ -108,12 +108,18 @@ five-safes-crate:SignOffPhaseProperties
         sh:description "Check if the Sign Off phase has an instrument (TRE Policy)" ;
         sh:path schema:instrument ;
         sh:class schema:CreativeWork ;
-        sh:hasValue schema:name ;
         sh:minCount 1 ;
         sh:severity sh:Warning ;
-        sh:message "The Sign-Off Phase SHOULD have an TRE policy (instrument) with type CreativeWork and human-readable name" ;
-    ] .
-
+        sh:message "The Sign-Off Phase SHOULD have an TRE policy (instrument) with type CreativeWork" ;
+    ] ;
+    sh:property [
+        sh:description "Check if the Sign Off phase has an instrument (TRE Policy)" ;
+        sh:path ( schema:instrument schema:name ) ;
+        sh:datatype xsd:string ;
+        sh:minCount 1 ;
+        sh:severity sh:Warning ;
+        sh:message "The Sign-Off Phase SHOULD have an TRE policy (instrument) with a human-readable name" ;
+    ].
 
 
 

tests/integration/profiles/five-safes-crate/test_5src_signoff_phase.py

@@ -264,7 +264,7 @@ def test_5src_signoff_phase_instrument_no_type():
         expected_validation_result=False,
         expected_triggered_requirements=["SignOffPhaseProperties"],
         expected_triggered_issues=[
-            "The Sign-Off Phase SHOULD have an TRE policy (instrument) with type CreativeWork and human-readable name"
+            "The Sign-Off Phase SHOULD have an TRE policy (instrument) with type CreativeWork"
         ],
         profile_identifier="five-safes-crate",
         rocrate_entity_mod_sparql=sparql,
@@ -296,7 +296,7 @@ def test_5src_signoff_phase_instrument_no_name():
         expected_validation_result=False,
         expected_triggered_requirements=["SignOffPhaseProperties"],
         expected_triggered_issues=[
-            "The Sign-Off Phase SHOULD have an TRE policy (instrument) with type CreativeWork and human-readable name"
+            "The Sign-Off Phase SHOULD have an TRE policy (instrument) with a human-readable name"
         ],
         profile_identifier="five-safes-crate",
         rocrate_entity_mod_sparql=sparql,