Skip to content

Commit 9b12bc7

Browse files
committed
Amended formatting
1 parent ab465be commit 9b12bc7

17 files changed

Lines changed: 71 additions & 166 deletions

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -87,9 +87,7 @@ def test_result_output_does_not_have_allowed_type():
8787
requirement_severity=Severity.RECOMMENDED,
8888
expected_validation_result=False,
8989
expected_triggered_requirements=["Output"],
90-
expected_triggered_issues=[
91-
"Result SHOULD have a `@type` among an allowed set of values."
92-
],
90+
expected_triggered_issues=["Result SHOULD have a `@type` among an allowed set of values."],
9391
profile_identifier="five-safes-crate",
9492
rocrate_entity_mod_sparql=sparql,
9593
)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -267,9 +267,7 @@ def test_5src_workflow_object_has_no_end_time_if_ended():
267267
requirement_severity=Severity.RECOMMENDED,
268268
expected_validation_result=False,
269269
expected_triggered_requirements=["WorkflowExecution"],
270-
expected_triggered_issues=[
271-
"The workflow execution object SHOULD have an endTime property if it has ended."
272-
],
270+
expected_triggered_issues=["The workflow execution object SHOULD have an endTime property if it has ended."],
273271
profile_identifier="five-safes-crate",
274272
rocrate_entity_mod_sparql=sparql,
275273
)

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -75,9 +75,7 @@ def test_5src_validation_check_name_not_a_string():
7575
requirement_severity=Severity.REQUIRED,
7676
expected_validation_result=False,
7777
expected_triggered_requirements=["ValidationCheck"],
78-
expected_triggered_issues=[
79-
"ValidationCheck MUST have a human readable name string."
80-
],
78+
expected_triggered_issues=["ValidationCheck MUST have a human readable name string."],
8179
profile_identifier="five-safes-crate",
8280
rocrate_entity_mod_sparql=sparql,
8381
)
@@ -200,9 +198,7 @@ def test_5src_root_data_entity_does_not_mention_validation_check_entity():
200198
requirement_severity=Severity.RECOMMENDED,
201199
expected_validation_result=False,
202200
expected_triggered_requirements=["RootDataEntity"],
203-
expected_triggered_issues=[
204-
"RootDataEntity SHOULD mention a ValidationCheck object."
205-
],
201+
expected_triggered_issues=["RootDataEntity SHOULD mention a ValidationCheck object."],
206202
profile_identifier="five-safes-crate",
207203
rocrate_entity_mod_sparql=sparql,
208204
)
@@ -229,9 +225,7 @@ def test_5src_validation_check_object_does_not_point_to_root_data_entity():
229225
requirement_severity=Severity.RECOMMENDED,
230226
expected_validation_result=False,
231227
expected_triggered_requirements=["ValidationCheck"],
232-
expected_triggered_issues=[
233-
"`ValidationCheck` --> `object` SHOULD point to the root of the RO-Crate"
234-
],
228+
expected_triggered_issues=["`ValidationCheck` --> `object` SHOULD point to the root of the RO-Crate"],
235229
profile_identifier="five-safes-crate",
236230
rocrate_entity_mod_sparql=sparql,
237231
)
@@ -283,9 +277,7 @@ def test_5src_Validation_check_does_not_have_action_status_property():
283277
requirement_severity=Severity.RECOMMENDED,
284278
expected_validation_result=False,
285279
expected_triggered_requirements=["ValidationCheck"],
286-
expected_triggered_issues=[
287-
"ValidationCheck SHOULD have actionStatus property."
288-
],
280+
expected_triggered_issues=["ValidationCheck SHOULD have actionStatus property."],
289281
profile_identifier="five-safes-crate",
290282
rocrate_entity_mod_sparql=sparql,
291283
)

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -45,9 +45,7 @@ def test_5src_download_action_does_not_have_name():
4545
requirement_severity=Severity.REQUIRED,
4646
expected_validation_result=False,
4747
expected_triggered_requirements=["DownloadAction"],
48-
expected_triggered_issues=[
49-
"DownloadAction MUST have a human readable name string."
50-
],
48+
expected_triggered_issues=["DownloadAction MUST have a human readable name string."],
5149
profile_identifier="five-safes-crate",
5250
rocrate_entity_mod_sparql=sparql,
5351
)
@@ -74,9 +72,7 @@ def test_5src_download_action_name_not_a_string():
7472
requirement_severity=Severity.REQUIRED,
7573
expected_validation_result=False,
7674
expected_triggered_requirements=["DownloadAction"],
77-
expected_triggered_issues=[
78-
"DownloadAction MUST have a human readable name string."
79-
],
75+
expected_triggered_issues=["DownloadAction MUST have a human readable name string."],
8076
profile_identifier="five-safes-crate",
8177
rocrate_entity_mod_sparql=sparql,
8278
)
@@ -206,10 +202,7 @@ def test_5src_downloaded_workflow_distribution_is_not_the_same_as_download_actio
206202
expected_validation_result=False,
207203
expected_triggered_requirements=["Downloaded Workflow"],
208204
expected_triggered_issues=[
209-
(
210-
"DownloadedWorkflow --> `distribution` MUST reference "
211-
"the same entity as `DownloadAction` --> `object`."
212-
)
205+
("DownloadedWorkflow --> `distribution` MUST reference the same entity as `DownloadAction` --> `object`.")
213206
],
214207
profile_identifier="five-safes-crate",
215208
rocrate_entity_mod_sparql=sparql,
@@ -295,9 +288,7 @@ def test_5src_root_data_entity_does_not_mention_download_action_entity():
295288
requirement_severity=Severity.RECOMMENDED,
296289
expected_validation_result=False,
297290
expected_triggered_requirements=["RootDataEntity"],
298-
expected_triggered_issues=[
299-
"RootDataEntity SHOULD mention DownloadAction if this exists."
300-
],
291+
expected_triggered_issues=["RootDataEntity SHOULD mention DownloadAction if this exists."],
301292
profile_identifier="five-safes-crate",
302293
rocrate_entity_mod_sparql=sparql,
303294
)
@@ -352,9 +343,7 @@ def test_5src_download_action_does_not_have_action_status_property():
352343
requirement_severity=Severity.RECOMMENDED,
353344
expected_validation_result=False,
354345
expected_triggered_requirements=["DownloadAction"],
355-
expected_triggered_issues=[
356-
"`DownloadAction` SHOULD have `actionStatus` property."
357-
],
346+
expected_triggered_issues=["`DownloadAction` SHOULD have `actionStatus` property."],
358347
profile_identifier="five-safes-crate",
359348
rocrate_entity_mod_sparql=sparql,
360349
)

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import logging
1717

1818
from rocrate_validator.models import Severity
19-
from tests.ro_crates import ValidROC, Invalid5sROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
19+
from tests.ro_crates import Invalid5sROC, ValidROC
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -47,9 +47,7 @@ def test_5src_conforms_to_old_version():
4747
rocrate_path=ValidROC().five_safes_crate_request,
4848
requirement_severity=Severity.REQUIRED,
4949
expected_validation_result=False,
50-
expected_triggered_requirements=[
51-
"RO-Crate conforms to 1.2 or later minor version"
52-
],
50+
expected_triggered_requirements=["RO-Crate conforms to 1.2 or later minor version"],
5351
expected_triggered_issues=[
5452
"The RO-Crate metadata file descriptor MUST have a `conformsTo` property with "
5553
"RO-Crate specification version 1.2 or later minor version"

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -44,12 +44,9 @@ def test_5src_assess_action_not_referenced_from_rde():
4444
rocrate_path=ValidROC().five_safes_crate_result,
4545
requirement_severity=Severity.REQUIRED,
4646
expected_validation_result=False,
47-
expected_triggered_requirements=[
48-
"All AssessActions are mentioned from Root Data Entity"
49-
],
47+
expected_triggered_requirements=["All AssessActions are mentioned from Root Data Entity"],
5048
expected_triggered_issues=[
51-
"All AssessAction entities in the crate MUST be referenced from "
52-
"the Root Dataset via `mentions`."
49+
"All AssessAction entities in the crate MUST be referenced from the Root Dataset via `mentions`."
5350
],
5451
profile_identifier="five-safes-crate",
5552
rocrate_entity_mod_sparql=sparql,

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -54,9 +54,7 @@ def test_5src_agent_memberOf_not_project():
5454
requirement_severity=Severity.REQUIRED,
5555
expected_validation_result=False,
5656
expected_triggered_requirements=["Requesting Agent"],
57-
expected_triggered_issues=[
58-
"The 'memberOf' property of an agent MUST be of type Project."
59-
],
57+
expected_triggered_issues=["The 'memberOf' property of an agent MUST be of type Project."],
6058
profile_identifier="five-safes-crate",
6159
rocrate_entity_mod_sparql=sparql,
6260
)
@@ -131,9 +129,7 @@ def test_5src_agent_memberOf_missing_warning():
131129
requirement_severity=Severity.RECOMMENDED,
132130
expected_validation_result=False, # or True if warnings are not treated as failures
133131
expected_triggered_requirements=["Requesting Agent"],
134-
expected_triggered_issues=[
135-
"The Requesting Agent SHOULD have a `memberOf` property."
136-
],
132+
expected_triggered_issues=["The Requesting Agent SHOULD have a `memberOf` property."],
137133
profile_identifier="five-safes-crate",
138134
rocrate_entity_mod_sparql=sparql,
139135
)

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -56,9 +56,7 @@ def test_5src_responsible_project_funding_not_grant():
5656
requirement_severity=Severity.REQUIRED,
5757
expected_validation_result=False,
5858
expected_triggered_requirements=["Responsible Project"],
59-
expected_triggered_issues=[
60-
"The property 'funding' of the Responsible Project MUST be of type Grant."
61-
],
59+
expected_triggered_issues=["The property 'funding' of the Responsible Project MUST be of type Grant."],
6260
profile_identifier="five-safes-crate",
6361
rocrate_entity_mod_sparql=sparql,
6462
)
@@ -136,9 +134,7 @@ def test_5src_responsible_project_member_and_agent_affiliation_no_intersection()
136134
rocrate_path=ValidROC().five_safes_crate_request,
137135
requirement_severity=Severity.RECOMMENDED,
138136
expected_validation_result=False,
139-
expected_triggered_requirements=[
140-
"Organizations (members of Responsible Project)"
141-
],
137+
expected_triggered_requirements=["Organizations (members of Responsible Project)"],
142138
expected_triggered_issues=[
143139
(
144140
"At least one of the organisations that are members of the responsible project SHOULD "
@@ -178,9 +174,7 @@ def test_5src_responsible_project_missing_funding_property():
178174
requirement_severity=Severity.OPTIONAL,
179175
expected_validation_result=False,
180176
expected_triggered_requirements=["Responsible Project"],
181-
expected_triggered_issues=[
182-
"The Responsible Project does not have the property `funding`."
183-
],
177+
expected_triggered_issues=["The Responsible Project does not have the property `funding`."],
184178
profile_identifier="five-safes-crate",
185179
rocrate_entity_mod_sparql=sparql,
186180
)
@@ -211,9 +205,7 @@ def test_5src_responsible_project_missing_member_property():
211205
requirement_severity=Severity.OPTIONAL,
212206
expected_validation_result=False,
213207
expected_triggered_requirements=["Responsible Project"],
214-
expected_triggered_issues=[
215-
"The Responsible Project does not have the property `member`."
216-
],
208+
expected_triggered_issues=["The Responsible Project does not have the property `member`."],
217209
profile_identifier="five-safes-crate",
218210
rocrate_entity_mod_sparql=sparql,
219211
)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -47,9 +47,7 @@ def test_5src_root_data_entity_without_source_organization():
4747
requirement_severity=Severity.REQUIRED,
4848
expected_validation_result=False,
4949
expected_triggered_requirements=["RootDataEntity"],
50-
expected_triggered_issues=[
51-
"""The Root Data Entity MUST have a `sourceOrganization` property."""
52-
],
50+
expected_triggered_issues=["""The Root Data Entity MUST have a `sourceOrganization` property."""],
5351
profile_identifier="five-safes-crate",
5452
rocrate_entity_mod_sparql=sparql,
5553
)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from rocrate_validator.models import Severity
1919
from tests.ro_crates import ValidROC
20-
from tests.shared import do_entity_test, SPARQL_PREFIXES
20+
from tests.shared import SPARQL_PREFIXES, do_entity_test
2121

2222
# set up logging
2323
logger = logging.getLogger(__name__)
@@ -50,9 +50,7 @@ def test_createaction_does_not_have_agent():
5050
requirement_severity=Severity.REQUIRED,
5151
expected_validation_result=False,
5252
expected_triggered_requirements=["CreateAction"],
53-
expected_triggered_issues=[
54-
"CreateAction MUST have at least one agent that is a contextual entity."
55-
],
53+
expected_triggered_issues=["CreateAction MUST have at least one agent that is a contextual entity."],
5654
profile_identifier="five-safes-crate",
5755
rocrate_entity_mod_sparql=sparql,
5856
)

0 commit comments

Comments
 (0)