-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #514 from aml-org/W-10984850
W-10984850: filter non-applicable validations when validating enum values in dialect definition
- Loading branch information
Showing
8 changed files
with
406 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
...resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{ | ||
"$type": "Dialect 1.0", | ||
"nodeMappings": { | ||
"MyNodeMapping": { | ||
"mapping": { | ||
"propertyA": { | ||
"range": "integer", | ||
"mandatory": true, | ||
"enum": [ | ||
"some-enum-value" | ||
] | ||
}, | ||
"propertyB": { | ||
"range": "boolean", | ||
"mandatory": false, | ||
"enum": [ | ||
60 | ||
] | ||
}, | ||
"propertyC": { | ||
"range": "boolean", | ||
"mandatory": false, | ||
"enum": [ | ||
10000 | ||
] | ||
} | ||
}, | ||
"additionalProperties": true | ||
} | ||
}, | ||
"dialect": "Test", | ||
"version": "1.0", | ||
"documents": { | ||
"root": { | ||
"encodes": "MyNodeMapping" | ||
} | ||
} | ||
} |
180 changes: 180 additions & 0 deletions
180
.../resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/report.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationReport", | ||
"http://www.w3.org/ns/shacl#conforms": false, | ||
"http://www.w3.org/ns/shacl#result": [ | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationResult", | ||
"http://www.w3.org/ns/shacl#resultSeverity": { | ||
"@id": "http://www.w3.org/ns/shacl#Violation" | ||
}, | ||
"http://www.w3.org/ns/shacl#focusNode": { | ||
"@id": "anId" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultPath": { | ||
"@id": "http://a.ml/vocabularies/data#propertyA" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultMessage": "Cannot find expected range for property http://a.ml/vocabularies/data#propertyA (propertyA). Found 'http://www.w3.org/2001/XMLSchema#string', expected 'http://www.w3.org/2001/XMLSchema#integer'", | ||
"http://www.w3.org/ns/shacl#sourceShape": { | ||
"@id": "http://a.ml/vocabularies/amf/aml#inconsistent-property-range-value" | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#lexicalPosition": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Position", | ||
"http://a.ml/vocabularies/amf/parser#start": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 10, | ||
"http://a.ml/vocabularies/amf/parser#column": 12 | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#end": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 10, | ||
"http://a.ml/vocabularies/amf/parser#column": 29 | ||
} | ||
} | ||
}, | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationResult", | ||
"http://www.w3.org/ns/shacl#resultSeverity": { | ||
"@id": "http://www.w3.org/ns/shacl#Violation" | ||
}, | ||
"http://www.w3.org/ns/shacl#focusNode": { | ||
"@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultPath": { | ||
"@id": "http://a.ml/vocabularies/data#propertyA" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultMessage": "Property 'propertyA' value must be of type http://www.w3.org/2001/XMLSchema#integer", | ||
"http://www.w3.org/ns/shacl#sourceShape": { | ||
"@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json#/declarations/MyNodeMapping_propertyA_dataRange_validation" | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#lexicalPosition": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Position", | ||
"http://a.ml/vocabularies/amf/parser#start": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 10, | ||
"http://a.ml/vocabularies/amf/parser#column": 12 | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#end": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 10, | ||
"http://a.ml/vocabularies/amf/parser#column": 29 | ||
} | ||
} | ||
}, | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationResult", | ||
"http://www.w3.org/ns/shacl#resultSeverity": { | ||
"@id": "http://www.w3.org/ns/shacl#Violation" | ||
}, | ||
"http://www.w3.org/ns/shacl#focusNode": { | ||
"@id": "anId" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultPath": { | ||
"@id": "http://a.ml/vocabularies/data#propertyB" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultMessage": "Cannot find expected range for property http://a.ml/vocabularies/data#propertyB (propertyB). Found 'http://www.w3.org/2001/XMLSchema#integer', expected 'http://www.w3.org/2001/XMLSchema#boolean'", | ||
"http://www.w3.org/ns/shacl#sourceShape": { | ||
"@id": "http://a.ml/vocabularies/amf/aml#inconsistent-property-range-value" | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#lexicalPosition": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Position", | ||
"http://a.ml/vocabularies/amf/parser#start": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 17, | ||
"http://a.ml/vocabularies/amf/parser#column": 12 | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#end": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 17, | ||
"http://a.ml/vocabularies/amf/parser#column": 14 | ||
} | ||
} | ||
}, | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationResult", | ||
"http://www.w3.org/ns/shacl#resultSeverity": { | ||
"@id": "http://www.w3.org/ns/shacl#Violation" | ||
}, | ||
"http://www.w3.org/ns/shacl#focusNode": { | ||
"@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultPath": { | ||
"@id": "http://a.ml/vocabularies/data#propertyB" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultMessage": "Property 'propertyB' value must be of type http://www.w3.org/2001/XMLSchema#boolean", | ||
"http://www.w3.org/ns/shacl#sourceShape": { | ||
"@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json#/declarations/MyNodeMapping_propertyB_dataRange_validation" | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#lexicalPosition": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Position", | ||
"http://a.ml/vocabularies/amf/parser#start": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 17, | ||
"http://a.ml/vocabularies/amf/parser#column": 12 | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#end": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 17, | ||
"http://a.ml/vocabularies/amf/parser#column": 14 | ||
} | ||
} | ||
}, | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationResult", | ||
"http://www.w3.org/ns/shacl#resultSeverity": { | ||
"@id": "http://www.w3.org/ns/shacl#Violation" | ||
}, | ||
"http://www.w3.org/ns/shacl#focusNode": { | ||
"@id": "anId" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultPath": { | ||
"@id": "http://a.ml/vocabularies/data#propertyC" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultMessage": "Cannot find expected range for property http://a.ml/vocabularies/data#propertyC (propertyC). Found 'http://www.w3.org/2001/XMLSchema#integer', expected 'http://www.w3.org/2001/XMLSchema#boolean'", | ||
"http://www.w3.org/ns/shacl#sourceShape": { | ||
"@id": "http://a.ml/vocabularies/amf/aml#inconsistent-property-range-value" | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#lexicalPosition": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Position", | ||
"http://a.ml/vocabularies/amf/parser#start": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 24, | ||
"http://a.ml/vocabularies/amf/parser#column": 12 | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#end": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 24, | ||
"http://a.ml/vocabularies/amf/parser#column": 17 | ||
} | ||
} | ||
}, | ||
{ | ||
"@type": "http://www.w3.org/ns/shacl#ValidationResult", | ||
"http://www.w3.org/ns/shacl#resultSeverity": { | ||
"@id": "http://www.w3.org/ns/shacl#Violation" | ||
}, | ||
"http://www.w3.org/ns/shacl#focusNode": { | ||
"@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultPath": { | ||
"@id": "http://a.ml/vocabularies/data#propertyC" | ||
}, | ||
"http://www.w3.org/ns/shacl#resultMessage": "Property 'propertyC' value must be of type http://www.w3.org/2001/XMLSchema#boolean", | ||
"http://www.w3.org/ns/shacl#sourceShape": { | ||
"@id": "file://amf-aml/shared/src/test/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/invalid.json#/declarations/MyNodeMapping_propertyC_dataRange_validation" | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#lexicalPosition": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Position", | ||
"http://a.ml/vocabularies/amf/parser#start": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 24, | ||
"http://a.ml/vocabularies/amf/parser#column": 12 | ||
}, | ||
"http://a.ml/vocabularies/amf/parser#end": { | ||
"@type": "http://a.ml/vocabularies/amf/parser#Location", | ||
"http://a.ml/vocabularies/amf/parser#line": 24, | ||
"http://a.ml/vocabularies/amf/parser#column": 17 | ||
} | ||
} | ||
} | ||
] | ||
} |
38 changes: 38 additions & 0 deletions
38
...t/resources/vocabularies2/instances/invalids/dialect-enum-multiple-validations/valid.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{ | ||
"$type": "Dialect 1.0", | ||
"nodeMappings": { | ||
"MyNodeMapping": { | ||
"mapping": { | ||
"propertyA": { | ||
"range": "string", | ||
"mandatory": true, | ||
"enum": [ | ||
"some-enum-value" | ||
] | ||
}, | ||
"propertyB": { | ||
"range": "integer", | ||
"mandatory": false, | ||
"enum": [ | ||
60 | ||
] | ||
}, | ||
"propertyC": { | ||
"range": "integer", | ||
"mandatory": false, | ||
"enum": [ | ||
10000 | ||
] | ||
} | ||
}, | ||
"additionalProperties": true | ||
} | ||
}, | ||
"dialect": "Test", | ||
"version": "1.0", | ||
"documents": { | ||
"root": { | ||
"encodes": "MyNodeMapping" | ||
} | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
...t/resources/vocabularies2/instances/invalids/dialect-enum-single-validations/invalid.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
{ | ||
"$type": "Dialect 1.0", | ||
"nodeMappings": { | ||
"MyNodeMapping": { | ||
"mapping": { | ||
"propertyA": { | ||
"range": "integer", | ||
"mandatory": true, | ||
"enum": [ | ||
"some-enum-value" | ||
] | ||
} | ||
}, | ||
"additionalProperties": true | ||
} | ||
}, | ||
"dialect": "Test", | ||
"version": "1.0", | ||
"documents": { | ||
"root": { | ||
"encodes": "MyNodeMapping" | ||
} | ||
} | ||
} |
Oops, something went wrong.