Addressed Eli's and Doug's comments.

Author: EttoreM

rocrate_validator/profiles/five-safes-crate/must/1_requesting_agent.ttl

@@ -78,5 +78,5 @@ five-safes-crate:AgentProjectIntersection
             }
         """ ;
         sh:severity sh:Violation ;
-        sh:message """Agent -> memberOf MUST intersect RootDataEntity -> sourceOrganization.""" ;
+        sh:message """At least one Project referenced by Agent -> memberOf MUST be included in the set of Projects referenced by RootDataEntity -> sourceOrganization.""" ;
     ] .

rocrate_validator/profiles/five-safes-crate/should/1_responsible_project.ttl

@@ -56,5 +56,5 @@ five-safes-crate:ResponsibleProjectMemberAndSourceOrganizationIntersection
             }
         """ ;
         sh:severity sh:Warning ;
-        sh:message """Responsible Project --> member SHOULD intersect Requesting Agent --> affiliation.""" ;
+        sh:message """At least one of the organisations that are members of the responsible project SHOULD be included in the Requesting Agent's affiliations, if such properties exist.""" ;
     ] .

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

@@ -95,7 +95,10 @@ def test_5src_agent_memberOf_project_not_in_root():
         expected_validation_result=False,
         expected_triggered_requirements=["Agent Project Intersection"],
         expected_triggered_issues=[
-            """Agent -> memberOf MUST intersect RootDataEntity -> sourceOrganization."""
+            (
+                "At least one Project referenced by Agent -> memberOf MUST be included "
+                "in the set of Projects referenced by RootDataEntity -> sourceOrganization."
+            )
         ],
         profile_identifier="five-safes-crate",
         rocrate_entity_mod_sparql=sparql,

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

@@ -126,9 +126,7 @@ def test_5src_responsible_project_member_and_agent_affiliation_no_intersection()
             ?agent a schema:Person ;
                    schema:memberOf ?project ;
                    schema:affiliation ?oldAff .
-            ?project schema:member ?org2 .
-
-            FILTER NOT EXISTS { ?project schema:member <#missing-affiliation> }
+            ?project schema:member ?oldAff .
         }
         """
     )
@@ -141,7 +139,10 @@ def test_5src_responsible_project_member_and_agent_affiliation_no_intersection()
             "Organizations (members of Responsible Project)"
         ],
         expected_triggered_issues=[
-            "Responsible Project --> member SHOULD intersect Requesting Agent --> affiliation."
+            (
+                "At least one of the organisations that are members of the responsible project SHOULD "
+                "be included in the Requesting Agent's affiliations, if such properties exist."
+            )
         ],
         profile_identifier="five-safes-crate",
         rocrate_entity_mod_sparql=sparql,