Addressed Eli's comments.

Author: EttoreM

rocrate_validator/profiles/five-safes-crate/should/10_outputs.ttl

@@ -26,17 +26,17 @@
 five-safes-crate:CreateActionHasResultIfActionCompleted
   a sh:NodeShape ;
   sh:name "CreateAction" ;
-  sh:description "`CreateAction` with CompleteActionStatus SHOULD have the `schema:result` property." ;
+  sh:description "`CreateAction` with CompletedActionStatus SHOULD have the `schema:result` property." ;
 
   sh:target [
         a sh:SPARQLTarget ;
         sh:name "Result" ;
-        sh:description "`CreateAction` with CompleteActionStatus SHOULD have the `schema:result` property." ;
+        sh:description "`CreateAction` with CompletedActionStatus SHOULD have the `schema:result` property." ;
         sh:prefixes ro-crate:sparqlPrefixes ;
         sh:select """
             SELECT ?this WHERE {
               ?this a schema:CreateAction ;
-                      schema:actionStatus "http://schema.org/CompleteActionStatus" .
+                      schema:actionStatus "http://schema.org/CompletedActionStatus" .
             }
         """
     ] ;
@@ -48,7 +48,7 @@ five-safes-crate:CreateActionHasResultIfActionCompleted
     sh:path schema:result ;
     sh:minCount 1 ;
     sh:severity sh:Warning ;
-    sh:message "`CreateAction` with CompleteActionStatus SHOULD have the `schema:result` property." ;
+    sh:message "`CreateAction` with CompletedActionStatus SHOULD have the `schema:result` property." ;
   ] .
 
 

tests/data/crates/valid/five-safes-crate-result/ro-crate-metadata.json

@@ -106,7 +106,7 @@
         {
             "@id": "#query-37252371-c937-43bd-a0a7-3680b48c0538",
             "@type": "CreateAction",
-            "actionStatus": "http://schema.org/CompleteActionStatus",
+            "actionStatus": "http://schema.org/CompletedActionStatus",
             "agent": {
                 "@id": "https://orcid.org/0000-0001-9842-9718"
             },

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

@@ -27,9 +27,9 @@
 
 def test_completed_createaction_does_not_have_result():
     """
-    Test a Five Safes Crate where `CreateAction` has `CompleteActionStatus` but
+    Test a Five Safes Crate where `CreateAction` has `CompletedActionStatus` but
     does not have the property `result`.
-    (We remove `result` from `CreateAction` if this has `CompleteActionStatus`)
+    (We remove `result` from `CreateAction` if this has `CompletedActionStatus`)
     """
     sparql = (
         SPARQL_PREFIXES
@@ -39,16 +39,20 @@ def test_completed_createaction_does_not_have_result():
         }
         WHERE {
             ?action a schema:CreateAction ;
-                      schema:actionStatus "http://schema.org/CompleteActionStatus" .        }
+                      schema:actionStatus "http://schema.org/CompletedActionStatus" ;
+                      schema:result ?o
+        }
         """
     )
 
     do_entity_test(
-        rocrate_path=ValidROC().five_safes_crate_request,
+        rocrate_path=ValidROC().five_safes_crate_result,
         requirement_severity=Severity.RECOMMENDED,
         expected_validation_result=False,
-        expected_triggered_requirements=None,
-        expected_triggered_issues=None,
+        expected_triggered_requirements=["CreateAction"],
+        expected_triggered_issues=[
+            "`CreateAction` with CompletedActionStatus SHOULD have the `schema:result` property."
+        ],
         profile_identifier="five-safes-crate",
         rocrate_entity_mod_sparql=sparql,
     )
@@ -77,11 +81,13 @@ def test_result_output_does_not_have_allowed_type():
     )
 
     do_entity_test(
-        rocrate_path=ValidROC().five_safes_crate_request,
+        rocrate_path=ValidROC().five_safes_crate_result,
         requirement_severity=Severity.RECOMMENDED,
         expected_validation_result=False,
-        expected_triggered_requirements=None,
-        expected_triggered_issues=None,
+        expected_triggered_requirements=["Output"],
+        expected_triggered_issues=[
+            "Result SHOULD have a `@type` among an allowed set of values."
+        ],
         profile_identifier="five-safes-crate",
         rocrate_entity_mod_sparql=sparql,
     )