diff --git a/core/model/src/main/java/org/eclipse/rdf4j/model/impl/DynamicModel.java b/core/model/src/main/java/org/eclipse/rdf4j/model/impl/DynamicModel.java index b8ae89b652f..2254f58d0e3 100644 --- a/core/model/src/main/java/org/eclipse/rdf4j/model/impl/DynamicModel.java +++ b/core/model/src/main/java/org/eclipse/rdf4j/model/impl/DynamicModel.java @@ -17,13 +17,12 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import org.eclipse.rdf4j.common.iterator.EmptyIterator; -import org.eclipse.rdf4j.common.iterator.SingletonIterator; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.ModelFactory; @@ -334,9 +333,9 @@ public Iterable getStatements(Resource subject, IRI predicate, Value .createStatement(subject, predicate, object, contexts[0]); Statement foundStatement = statements.get(statement); if (foundStatement == null) { - return EmptyIterator::new; + return List.of(); } - return () -> new SingletonIterator<>(foundStatement); + return List.of(foundStatement); } else if (model == null && subject == null && predicate == null && object == null && contexts != null && contexts.length == 0) { return this; diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSail.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSail.java index adf3d6bf7e5..066ff2eec9b 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSail.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSail.java @@ -325,6 +325,7 @@ public static List getSupportedShaclPredicates() { SHACL.PREFIXES, SHACL.PREFIX_PROP, SHACL.NAMESPACE_PROP, + SHACL.SEVERITY_PROP, DASH.hasValueIn, RSX.targetShape ); @@ -398,7 +399,8 @@ public List getShapes(RepositoryConnection shapesRepoConnecti try (ShapeSource shapeSource = new CombinedShapeSource(shapesRepoConnection, sailConnection) .withContext(shapesGraphs)) { - return Shape.Factory.getShapes(shapeSource, this); + return Shape.Factory.getShapes(shapeSource, + new Shape.ParseSettings(isEclipseRdf4jShaclExtensions(), isDashDataShapes())); } } @@ -408,7 +410,8 @@ public List getShapes(RepositoryConnection shapesRepoConnecti throws SailException { try (ShapeSource shapeSource = new ForwardChainingShapeSource(shapesRepoConnection).withContext(shapesGraphs)) { - return Shape.Factory.getShapes(shapeSource, this); + return Shape.Factory.getShapes(shapeSource, + new Shape.ParseSettings(isEclipseRdf4jShaclExtensions(), isDashDataShapes())); } } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java index ee5ba07e002..0d842fd5f41 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java @@ -48,7 +48,6 @@ import org.eclipse.rdf4j.sail.shacl.ShaclSail.TransactionSettings.ValidationApproach; import org.eclipse.rdf4j.sail.shacl.ast.ContextWithShapes; import org.eclipse.rdf4j.sail.shacl.ast.Shape; -import org.eclipse.rdf4j.sail.shacl.ast.planNodes.EmptyNode; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.PlanNode; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.SingleCloseablePlanNode; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.ValidationExecutionLogger; @@ -482,12 +481,12 @@ private ValidationReport validate(List shapes, boolean valida } - void prepareValidation() throws InterruptedException { + void prepareValidation(ValidationSettings validationSettings) throws InterruptedException { assert isValidationEnabled(); if (sail.isRdfsSubClassReasoning()) { - rdfsSubClassOfReasoner = RdfsSubClassOfReasoner.createReasoner(this); + rdfsSubClassOfReasoner = RdfsSubClassOfReasoner.createReasoner(this, validationSettings); } if (!isBulkValidation()) { @@ -864,7 +863,8 @@ public void prepare() throws SailException { stats.setEmptyIncludingCurrentTransaction(ConnectionHelper.isEmpty(this)); - prepareValidation(); + prepareValidation( + new ValidationSettings(null, sail.isLogValidationPlans(), false, sail.isPerformanceLogging())); ValidationReport invalidTuples = null; if (useSerializableValidation) { @@ -1080,7 +1080,7 @@ private long getTimeStamp() { return 0; } - private class ValidationContainer { + public class ValidationContainer { private final Shape shape; private final PlanNode planNode; private final ValidationExecutionLogger validationExecutionLogger; @@ -1089,10 +1089,10 @@ public ValidationContainer(Shape shape, PlanNode planNode) { this.shape = shape; this.validationExecutionLogger = ValidationExecutionLogger .getInstance(sail.isGlobalLogValidationExecution()); - if (!(planNode instanceof EmptyNode)) { - this.planNode = new SingleCloseablePlanNode(planNode); - this.planNode.receiveLogger(validationExecutionLogger); - + if (!(planNode.isGuaranteedEmpty())) { + assert planNode instanceof SingleCloseablePlanNode; + planNode.receiveLogger(validationExecutionLogger); + this.planNode = planNode; } else { this.planNode = planNode; } @@ -1103,7 +1103,7 @@ public Shape getShape() { } public boolean hasPlanNode() { - return !(planNode instanceof EmptyNode); + return !(planNode.isGuaranteedEmpty()); } public ValidationResultIterator performValidation() { @@ -1115,7 +1115,7 @@ public ValidationResultIterator performValidation() { try (CloseableIteration iterator = planNode.iterator()) { validationResults = new ValidationResultIterator(iterator, - sail.getEffectiveValidationResultsLimitPerConstraint()); + sail.getEffectiveValidationResultsLimitPerConstraint(), shape.getSeverity()); return validationResults; } finally { handlePostLogging(before, validationResults); diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclValidator.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclValidator.java new file mode 100644 index 00000000000..bede631ad02 --- /dev/null +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclValidator.java @@ -0,0 +1,109 @@ +/******************************************************************************* + * Copyright (c) 2023 Eclipse RDF4J contributors. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Distribution License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + ******************************************************************************/ + +package org.eclipse.rdf4j.sail.shacl; + +import java.util.List; +import java.util.stream.Collectors; + +import org.eclipse.rdf4j.common.annotation.Experimental; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.transaction.IsolationLevels; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; +import org.eclipse.rdf4j.sail.shacl.ast.ContextWithShapes; +import org.eclipse.rdf4j.sail.shacl.ast.Shape; +import org.eclipse.rdf4j.sail.shacl.ast.planNodes.SingleCloseablePlanNode; +import org.eclipse.rdf4j.sail.shacl.ast.planNodes.ValidationExecutionLogger; +import org.eclipse.rdf4j.sail.shacl.ast.planNodes.ValidationTuple; +import org.eclipse.rdf4j.sail.shacl.results.ValidationReport; +import org.eclipse.rdf4j.sail.shacl.results.lazy.LazyValidationReport; +import org.eclipse.rdf4j.sail.shacl.results.lazy.ValidationResultIterator; +import org.eclipse.rdf4j.sail.shacl.wrapper.data.ConnectionsGroup; +import org.eclipse.rdf4j.sail.shacl.wrapper.data.RdfsSubClassOfReasoner; +import org.eclipse.rdf4j.sail.shacl.wrapper.data.VerySimpleRdfsBackwardsChainingConnection; +import org.eclipse.rdf4j.sail.shacl.wrapper.shape.CombinedShapeSource; +import org.eclipse.rdf4j.sail.shacl.wrapper.shape.ShapeSource; + +@Experimental +public class ShaclValidator { + + private static final Resource[] ALL_CONTEXTS = {}; + + // protected so that tests can override + protected static Resource[] CONTEXTS = {}; + + public static ValidationReport validate(Sail dataRepo, Sail shapesRepo) { + + List shapes; + try (SailConnection shapesConnection = shapesRepo.getConnection()) { + shapesConnection.begin(IsolationLevels.NONE); + try (ShapeSource shapeSource = new CombinedShapeSource(shapesConnection, + shapesConnection)) { + shapes = Shape.Factory.getShapes(shapeSource.withContext(CONTEXTS), + new Shape.ParseSettings(true, true)); + } + shapesConnection.commit(); + } + + try (SailConnection dataRepoConnection = dataRepo.getConnection()) { + + RdfsSubClassOfReasoner reasoner; + + try (SailConnection shapesConnection = shapesRepo.getConnection()) { + reasoner = RdfsSubClassOfReasoner.createReasoner( + dataRepoConnection, shapesConnection, + new ValidationSettings(ALL_CONTEXTS, false, true, false)); + } + + VerySimpleRdfsBackwardsChainingConnection verySimpleRdfsBackwardsChainingConnection = new VerySimpleRdfsBackwardsChainingConnection( + dataRepoConnection, reasoner); + + return performValidation(shapes, new ConnectionsGroup(verySimpleRdfsBackwardsChainingConnection, null, + null, null, new Stats(), () -> reasoner, + new ShaclSailConnection.Settings(true, true, true, IsolationLevels.NONE), true)); + } + + } + + private static ValidationReport performValidation(List shapes, + ConnectionsGroup connectionsGroup) { + + List collect = shapes + .stream() + .flatMap(contextWithShapes -> { + return contextWithShapes + .getShapes() + .stream() + .map(shape -> shape.generatePlans(connectionsGroup, + new ValidationSettings(contextWithShapes.getDataGraph(), false, true, false))); + } + ) + .map(planNode -> { + assert planNode instanceof SingleCloseablePlanNode; + planNode.receiveLogger(ValidationExecutionLogger.getInstance(false)); + return (SingleCloseablePlanNode) planNode; + }) + + .map(planNode -> { + try (CloseableIteration iterator = planNode.iterator()) { + return new ValidationResultIterator(iterator, 1000, planNode.getShape().getSeverity()); + } + }) + .collect(Collectors.toList()); + + return new LazyValidationReport(collect, 10000); + + } + +} diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/NodeShape.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/NodeShape.java index 85be7b9a57c..e6cd6acbf43 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/NodeShape.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/NodeShape.java @@ -20,7 +20,6 @@ import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.RDF; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.StatementMatcher.Variable; @@ -47,13 +46,13 @@ public NodeShape(NodeShape nodeShape) { } public static NodeShape getInstance(ShaclProperties properties, - ShapeSource shapeSource, Cache cache, ShaclSail shaclSail) { + ShapeSource shapeSource, ParseSettings parseSettings, Cache cache) { NodeShape shape = (NodeShape) cache.get(properties.getId()); if (shape == null) { shape = new NodeShape(); cache.put(properties.getId(), shape); - shape.populate(properties, shapeSource, cache, shaclSail); + shape.populate(properties, shapeSource, parseSettings, cache); } return shape; @@ -61,8 +60,8 @@ public static NodeShape getInstance(ShaclProperties properties, @Override public void populate(ShaclProperties properties, ShapeSource connection, - Cache cache, ShaclSail shaclSail) { - super.populate(properties, connection, cache, shaclSail); + ParseSettings parseSettings, Cache cache) { + super.populate(properties, connection, parseSettings, cache); if (properties.getMinCount() != null) { throw new IllegalStateException("NodeShapes do not support sh:MinCount in " + getId()); @@ -80,7 +79,7 @@ public void populate(ShaclProperties properties, ShapeSource connection, * Also not supported here is: - sh:lessThan - sh:lessThanOrEquals - sh:qualifiedValueShape */ - constraintComponents = getConstraintComponents(properties, connection, cache, shaclSail); + constraintComponents = getConstraintComponents(properties, connection, parseSettings, cache); } @@ -138,7 +137,7 @@ public ValidationQuery generateSparqlValidationQuery(ConnectionsGroup connection assert !(constraintComponents.get(0) instanceof PropertyShape); validationQuery = validationQuery.withShape(this); - validationQuery = validationQuery.withSeverity(severity); + validationQuery = validationQuery.withSeverity(Severity.orDefault(severity)); validationQuery.makeCurrentStateValidationReport(); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java index 6d2f7c7bd24..1145278b604 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java @@ -20,7 +20,6 @@ import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.RDF; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.StatementMatcher.Variable; @@ -64,13 +63,15 @@ public PropertyShape(PropertyShape propertyShape) { this.path = propertyShape.path; } - public static PropertyShape getInstance(ShaclProperties properties, ShapeSource shapeSource, Cache cache, - ShaclSail shaclSail) { + public static PropertyShape getInstance(ShaclProperties properties, ShapeSource shapeSource, + ParseSettings parseSettings, Cache cache) { + Shape shape = cache.get(properties.getId()); + if (shape == null) { shape = new PropertyShape(); cache.put(properties.getId(), shape); - shape.populate(properties, shapeSource, cache, shaclSail); + shape.populate(properties, shapeSource, parseSettings, cache); } if (shape.constraintComponents.isEmpty()) { @@ -81,9 +82,9 @@ public static PropertyShape getInstance(ShaclProperties properties, ShapeSource } @Override - public void populate(ShaclProperties properties, ShapeSource connection, - Cache cache, ShaclSail shaclSail) { - super.populate(properties, connection, cache, shaclSail); + public void populate(ShaclProperties properties, ShapeSource connection, ParseSettings parseSettings, Cache cache) { + + super.populate(properties, connection, parseSettings, cache); this.path = Path.buildPath(connection, properties.getPath()); @@ -91,8 +92,7 @@ public void populate(ShaclProperties properties, ShapeSource connection, throw new IllegalStateException(properties.getId() + " is a sh:PropertyShape without a sh:path!"); } - constraintComponents = getConstraintComponents(properties, connection, cache, shaclSail - ); + constraintComponents = getConstraintComponents(properties, connection, parseSettings, cache); } @Override diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Severity.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Severity.java index 362834d3af6..e05d7c73989 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Severity.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Severity.java @@ -10,21 +10,62 @@ *******************************************************************************/ package org.eclipse.rdf4j.sail.shacl.ast; +import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.SHACL; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public enum Severity { + Info(SHACL.INFO), Warning(SHACL.WARNING), Violation(SHACL.VIOLATION); - Value iri; + private static final Logger logger = LoggerFactory.getLogger(Severity.class); + + private final Value iri; Severity(Value iri) { this.iri = iri; } + public static Severity fromIri(IRI iri) { + if (iri == null) { + return null; + } else if (iri == SHACL.VIOLATION) { + return Severity.Violation; + } else if (iri == SHACL.WARNING) { + return Severity.Warning; + } else if (iri == SHACL.INFO) { + return Severity.Info; + } else if (Severity.Info.iri.equals(iri)) { + return Severity.Info; + } else if (Severity.Warning.iri.equals(iri)) { + return Severity.Warning; + } else if (Severity.Violation.iri.equals(iri)) { + return Severity.Violation; + } + + logger.warn("Unknown sh:severity: <{}>", iri); + + return null; + } + + public static Severity orDefault(Severity severity) { + if (severity == null) { + return Severity.Violation; + } + return severity; + } + public Value getIri() { return iri; } + + static { + // If we add more severity levels then we need to remember to update all the places where we assume that the + // severity can only be Info, Warning or Violation. + assert Severity.values().length == 3; + } } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclProperties.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclProperties.java index 6ec8f2b38d6..71f46d7f514 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclProperties.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclProperties.java @@ -93,6 +93,7 @@ public class ShaclProperties { private Resource ignoredProperties; private final List message = new ArrayList<>(); + private IRI severity; private final List sparql = new ArrayList<>(); @@ -145,6 +146,12 @@ public ShaclProperties(Resource id, ShapeSource connection) { case "http://www.w3.org/ns/shacl#message": message.add((Literal) object); break; + case "http://www.w3.org/ns/shacl#severity": + if (severity != null) { + throw new IllegalStateException(predicate + " already populated"); + } + severity = (IRI) object; + break; case "http://www.w3.org/ns/shacl#languageIn": if (languageIn != null) { throw new IllegalStateException(predicate + " already populated"); @@ -453,6 +460,10 @@ public List getMessage() { return message; } + public IRI getSeverity() { + return severity; + } + public List getProperty() { return property; } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Shape.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Shape.java index f62b38e96b8..8b3be3fb58f 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Shape.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Shape.java @@ -19,6 +19,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.eclipse.rdf4j.common.annotation.InternalUseOnly; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Model; @@ -38,7 +39,6 @@ import org.eclipse.rdf4j.rio.WriterConfig; import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; import org.eclipse.rdf4j.sail.SailException; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.StatementMatcher.Variable; @@ -74,6 +74,7 @@ import org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents.XoneConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.EmptyNode; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.PlanNode; +import org.eclipse.rdf4j.sail.shacl.ast.planNodes.SingleCloseablePlanNode; import org.eclipse.rdf4j.sail.shacl.ast.targets.DashAllObjects; import org.eclipse.rdf4j.sail.shacl.ast.targets.DashAllSubjects; import org.eclipse.rdf4j.sail.shacl.ast.targets.RSXTargetShape; @@ -102,7 +103,7 @@ abstract public class Shape implements ConstraintComponent, Identifiable { boolean deactivated; List message; - Severity severity = Severity.Violation; + Severity severity; List constraintComponents = new ArrayList<>(); @@ -121,12 +122,13 @@ public Shape(Shape shape) { this.produceValidationReports = shape.produceValidationReports; } - public void populate(ShaclProperties properties, ShapeSource shapeSource, Cache cache, - ShaclSail shaclSail) { + public void populate(ShaclProperties properties, ShapeSource shapeSource, ParseSettings parseSettings, + Cache cache) { this.deactivated = properties.isDeactivated(); this.message = properties.getMessage(); this.id = properties.getId(); this.contexts = shapeSource.getActiveContexts(); + this.severity = Severity.fromIri(properties.getSeverity()); if (!properties.getTargetClass().isEmpty()) { target.add(new TargetClass(properties.getTargetClass())); @@ -141,11 +143,11 @@ public void populate(ShaclProperties properties, ShapeSource shapeSource, Cache target.add(new TargetSubjectsOf(properties.getTargetSubjectsOf())); } - if (shaclSail.isEclipseRdf4jShaclExtensions() && !properties.getTargetShape().isEmpty()) { + if (parseSettings.parseEclipseRdf4jShaclExtensions() && !properties.getTargetShape().isEmpty()) { properties.getTargetShape() .stream() - .map(targetShape -> new RSXTargetShape(targetShape, shapeSource, shaclSail)) + .map(targetShape -> new RSXTargetShape(targetShape, shapeSource, parseSettings)) .forEach(target::add); } @@ -156,11 +158,11 @@ public void populate(ShaclProperties properties, ShapeSource shapeSource, Cache if (shapeSource.isType(target, SHACL.SPARQL_TARGET)) { this.target.add(new SparqlTarget(target, shapeSource)); } - if (shaclSail.isDashDataShapes() && shapeSource.isType(target, + if (parseSettings.parseDashDataShapes() && shapeSource.isType(target, DASH.AllObjectsTarget)) { this.target.add(new DashAllObjects(target)); } - if (shaclSail.isDashDataShapes() && shapeSource.isType(target, + if (parseSettings.parseDashDataShapes() && shapeSource.isType(target, DASH.AllSubjectsTarget)) { this.target.add(new DashAllSubjects(target)); } @@ -208,23 +210,27 @@ public void toModel(Resource subject, IRI predicate, Model model, Set t.toModel(getId(), null, model, cycleDetection); }); + if (severity != null) { + modelBuilder.add(SHACL.SEVERITY_PROP, severity.getIri()); + } + model.addAll(modelBuilder.build()); } List getConstraintComponents(ShaclProperties properties, ShapeSource shapeSource, - Cache cache, ShaclSail shaclSail) { + ParseSettings parseSettings, Cache cache) { List constraintComponent = new ArrayList<>(); for (Resource resource : properties.getProperty()) { var shaclProperties = new ShaclProperties(resource, shapeSource); - var instance = PropertyShape.getInstance(shaclProperties, shapeSource, cache, shaclSail); + var instance = PropertyShape.getInstance(shaclProperties, shapeSource, parseSettings, cache); constraintComponent.add(instance); } for (Resource r : properties.getNode()) { var shaclProperties = new ShaclProperties(r, shapeSource); - var instance = NodeShape.getInstance(shaclProperties, shapeSource, cache, shaclSail); + var instance = NodeShape.getInstance(shaclProperties, shapeSource, parseSettings, cache); constraintComponent.add(instance); } @@ -326,20 +332,20 @@ List getConstraintComponents(ShaclProperties properties, Sh if (properties.getQualifiedMaxCount() != null) { var qualifiedMaxCountConstraintComponent = new QualifiedMaxCountConstraintComponent( - properties.getQualifiedValueShape(), shapeSource, cache, shaclSail, + properties.getQualifiedValueShape(), shapeSource, parseSettings, cache, properties.getQualifiedValueShapesDisjoint(), properties.getQualifiedMaxCount()); constraintComponent.add(qualifiedMaxCountConstraintComponent); } if (properties.getQualifiedMinCount() != null) { var qualifiedMinCountConstraintComponent = new QualifiedMinCountConstraintComponent( - properties.getQualifiedValueShape(), shapeSource, cache, shaclSail, + properties.getQualifiedValueShape(), shapeSource, parseSettings, cache, properties.getQualifiedValueShapesDisjoint(), properties.getQualifiedMinCount()); constraintComponent.add(qualifiedMinCountConstraintComponent); } } - if (shaclSail.isDashDataShapes()) { + if (parseSettings.parseDashDataShapes()) { for (Resource hasValueIn : properties.getHasValueIn()) { var dashHasValueInConstraintComponent = new DashHasValueInConstraintComponent( shapeSource, hasValueIn); @@ -348,26 +354,22 @@ List getConstraintComponents(ShaclProperties properties, Sh } for (Resource resource : properties.getOr()) { - var orConstraintComponent = new OrConstraintComponent(resource, shapeSource, cache, - shaclSail); + var orConstraintComponent = new OrConstraintComponent(resource, shapeSource, parseSettings, cache); constraintComponent.add(orConstraintComponent); } for (Resource xone : properties.getXone()) { - var xoneConstraintComponent = new XoneConstraintComponent(xone, shapeSource, cache, - shaclSail); + var xoneConstraintComponent = new XoneConstraintComponent(xone, shapeSource, parseSettings, cache); constraintComponent.add(xoneConstraintComponent); } for (Resource and : properties.getAnd()) { - var andConstraintComponent = new AndConstraintComponent(and, shapeSource, cache, - shaclSail); + var andConstraintComponent = new AndConstraintComponent(and, shapeSource, parseSettings, cache); constraintComponent.add(andConstraintComponent); } for (Resource or : properties.getNot()) { - var notConstraintComponent = new NotConstraintComponent(or, shapeSource, cache, - shaclSail); + var notConstraintComponent = new NotConstraintComponent(or, shapeSource, parseSettings, cache); constraintComponent.add(notConstraintComponent); } @@ -409,15 +411,18 @@ public PlanNode generatePlans(ConnectionsGroup connectionsGroup, ValidationSetti if (connectionsGroup.isSparqlValidation() && Shape.this.getOptimalBulkValidationApproach() == ValidationApproach.SPARQL) { logger.debug("Use validation approach {} for shape {}", validationApproach, this); - return Shape.this.generateSparqlValidationQuery(connectionsGroup, validationSettings, false, false, - Scope.none) + return new SingleCloseablePlanNode(Shape.this + .generateSparqlValidationQuery(connectionsGroup, validationSettings, false, false, + Scope.none) .getValidationPlan(connectionsGroup.getBaseConnection(), validationSettings.getDataGraph(), - getContexts()); + getContexts()), + this); } else { logger.debug("Use fall back validation approach for bulk validation instead of SPARQL for shape {}", this); - return Shape.this.generateTransactionalValidationPlan(connectionsGroup, validationSettings, + return new SingleCloseablePlanNode(Shape.this.generateTransactionalValidationPlan(connectionsGroup, + validationSettings, () -> Shape.this.getTargetChain() .getEffectiveTarget( this instanceof NodeShape ? Scope.nodeShape : Scope.propertyShape, @@ -425,7 +430,7 @@ public PlanNode generatePlans(ConnectionsGroup connectionsGroup, ValidationSetti .getAllTargets(connectionsGroup, validationSettings.getDataGraph(), this instanceof NodeShape ? Scope.nodeShape : Scope.propertyShape), - Scope.none); + Scope.none), this); } } else if (validationApproach == ValidationApproach.Transactional) { @@ -433,8 +438,10 @@ public PlanNode generatePlans(ConnectionsGroup connectionsGroup, ValidationSetti if (this.requiresEvaluation(connectionsGroup, Scope.none, validationSettings.getDataGraph(), stableRandomVariableProvider)) { - return Shape.this.generateTransactionalValidationPlan(connectionsGroup, validationSettings, null, - Scope.none); + return new SingleCloseablePlanNode( + Shape.this.generateTransactionalValidationPlan(connectionsGroup, validationSettings, null, + Scope.none), + this); } else { return EmptyNode.getInstance(); } @@ -454,7 +461,7 @@ public SourceConstraintComponent getConstraintComponent() { } public Severity getSeverity() { - return severity; + return Severity.orDefault(severity); } public boolean isDeactivated() { @@ -509,9 +516,9 @@ public List getDefaultMessage() { public static class Factory { - public static List getShapes(ShapeSource shapeSource, ShaclSail shaclSail) { + public static List getShapes(ShapeSource shapeSource, ParseSettings parseSettings) { - List parsed = parse(shapeSource, shaclSail); + List parsed = parse(shapeSource, parseSettings); return parsed.stream() .map(contextWithShapes -> { @@ -618,13 +625,13 @@ private static Stream splitPropertyShape(PropertyShape propertySh }); } - private static List parse(ShapeSource shapeSource, ShaclSail shaclSail) { + private static List parse(ShapeSource shapeSource, ParseSettings parseSettings) { try (Stream allShapeContexts = shapeSource.getAllShapeContexts()) { return allShapeContexts .map(shapesGraph -> { Cache cache = new Cache(); - return getShapesInContext(shapeSource, shaclSail, cache, shapesGraph.getDataGraph(), + return getShapesInContext(shapeSource, parseSettings, cache, shapesGraph.getDataGraph(), shapesGraph.getShapesGraph()); }) .collect(Collectors.toList()); @@ -633,7 +640,8 @@ private static List parse(ShapeSource shapeSource, ShaclSail } - private static ContextWithShapes getShapesInContext(ShapeSource shapeSource, ShaclSail shaclSail, Cache cache, + private static ContextWithShapes getShapesInContext(ShapeSource shapeSource, ParseSettings parseSettings, + Cache cache, Resource[] dataGraph, Resource[] shapesGraph) { ShapeSource shapeSourceWithContext = shapeSource.withContext(shapesGraph); @@ -642,9 +650,9 @@ private static ContextWithShapes getShapesInContext(ShapeSource shapeSource, Sha .map(r -> new ShaclProperties(r, shapeSourceWithContext)) .map(p -> { if (p.getType() == SHACL.NODE_SHAPE) { - return NodeShape.getInstance(p, shapeSourceWithContext, cache, shaclSail); + return NodeShape.getInstance(p, shapeSourceWithContext, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - return PropertyShape.getInstance(p, shapeSourceWithContext, cache, shaclSail); + return PropertyShape.getInstance(p, shapeSourceWithContext, parseSettings, cache); } throw new IllegalStateException("Unknown shape type for " + p.getId()); }) @@ -664,9 +672,9 @@ public String toString() { statements.setNamespace(RSX.NS); statements.setNamespace(RDFS.NS); statements.setNamespace(RDF.NS); - WriterConfig writerConfig = new WriterConfig(); - writerConfig.set(BasicWriterSettings.PRETTY_PRINT, true); - writerConfig.set(BasicWriterSettings.INLINE_BLANK_NODES, true); + WriterConfig writerConfig = new WriterConfig() + .set(BasicWriterSettings.PRETTY_PRINT, true) + .set(BasicWriterSettings.INLINE_BLANK_NODES, true); StringWriter stringWriter = new StringWriter(); Rio.write(statements, stringWriter, RDFFormat.TURTLE, writerConfig); @@ -676,4 +684,24 @@ public String toString() { .trim(); } + @InternalUseOnly + public static class ParseSettings { + + private final boolean eclipseRdf4jShaclExtensions; + private final boolean dashDataShapes; + + public ParseSettings(boolean eclipseRdf4jShaclExtensions, boolean dashDataShapes) { + this.eclipseRdf4jShaclExtensions = eclipseRdf4jShaclExtensions; + this.dashDataShapes = dashDataShapes; + } + + public boolean parseEclipseRdf4jShaclExtensions() { + return eclipseRdf4jShaclExtensions; + } + + public boolean parseDashDataShapes() { + return dashDataShapes; + } + + } } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/AndConstraintComponent.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/AndConstraintComponent.java index bea0c19fbb6..0bf467b9ab1 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/AndConstraintComponent.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/AndConstraintComponent.java @@ -21,7 +21,6 @@ import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.Cache; @@ -49,16 +48,16 @@ public class AndConstraintComponent extends LogicalOperatorConstraintComponent { List and; public AndConstraintComponent(Resource id, ShapeSource shapeSource, - Cache cache, ShaclSail shaclSail) { + Shape.ParseSettings parseSettings, Cache cache) { super(id); and = ShaclAstLists.toList(shapeSource, id, Resource.class) .stream() .map(r -> new ShaclProperties(r, shapeSource)) .map(p -> { if (p.getType() == SHACL.NODE_SHAPE) { - return NodeShape.getInstance(p, shapeSource, cache, shaclSail); + return NodeShape.getInstance(p, shapeSource, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - return PropertyShape.getInstance(p, shapeSource, cache, shaclSail); + return PropertyShape.getInstance(p, shapeSource, parseSettings, cache); } throw new IllegalStateException("Unknown shape type for " + p.getId()); }) diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/NotConstraintComponent.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/NotConstraintComponent.java index 70417b5ae27..08bfa8e8b8f 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/NotConstraintComponent.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/NotConstraintComponent.java @@ -19,7 +19,6 @@ import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.Cache; @@ -45,15 +44,15 @@ public class NotConstraintComponent extends AbstractConstraintComponent { Shape not; public NotConstraintComponent(Resource id, ShapeSource shapeSource, - Cache cache, ShaclSail shaclSail) { + Shape.ParseSettings parseSettings, Cache cache) { super(id); ShaclProperties p = new ShaclProperties(id, shapeSource); if (p.getType() == SHACL.NODE_SHAPE) { - not = NodeShape.getInstance(p, shapeSource, cache, shaclSail); + not = NodeShape.getInstance(p, shapeSource, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - not = PropertyShape.getInstance(p, shapeSource, cache, shaclSail); + not = PropertyShape.getInstance(p, shapeSource, parseSettings, cache); } else { throw new IllegalStateException("Unknown shape type for " + p.getId()); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/OrConstraintComponent.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/OrConstraintComponent.java index 3fc4e315e27..ee746e0f10d 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/OrConstraintComponent.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/OrConstraintComponent.java @@ -22,7 +22,6 @@ import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.Cache; @@ -52,17 +51,16 @@ public class OrConstraintComponent extends LogicalOperatorConstraintComponent { List or; - public OrConstraintComponent(Resource id, ShapeSource shapeSource, - Cache cache, ShaclSail shaclSail) { + public OrConstraintComponent(Resource id, ShapeSource shapeSource, Shape.ParseSettings parseSettings, Cache cache) { super(id); or = ShaclAstLists.toList(shapeSource, id, Resource.class) .stream() .map(r -> new ShaclProperties(r, shapeSource)) .map(p -> { if (p.getType() == SHACL.NODE_SHAPE) { - return NodeShape.getInstance(p, shapeSource, cache, shaclSail); + return NodeShape.getInstance(p, shapeSource, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - return PropertyShape.getInstance(p, shapeSource, cache, shaclSail); + return PropertyShape.getInstance(p, shapeSource, parseSettings, cache); } throw new IllegalStateException("Unknown shape type for " + p.getId()); }) diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMaxCountConstraintComponent.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMaxCountConstraintComponent.java index 5c3fb5eca77..7f9bdf4d0a7 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMaxCountConstraintComponent.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMaxCountConstraintComponent.java @@ -22,7 +22,6 @@ import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.Cache; @@ -55,7 +54,8 @@ public class QualifiedMaxCountConstraintComponent extends AbstractConstraintComp Long qualifiedMaxCount; public QualifiedMaxCountConstraintComponent(Resource id, ShapeSource shapeSource, - Cache cache, ShaclSail shaclSail, Boolean qualifiedValueShapesDisjoint, Long qualifiedMaxCount) { + Shape.ParseSettings parseSettings, Cache cache, Boolean qualifiedValueShapesDisjoint, + Long qualifiedMaxCount) { super(id); ShaclProperties p = new ShaclProperties(id, shapeSource); @@ -64,9 +64,9 @@ public QualifiedMaxCountConstraintComponent(Resource id, ShapeSource shapeSource this.qualifiedMaxCount = qualifiedMaxCount; if (p.getType() == SHACL.NODE_SHAPE) { - qualifiedValueShape = NodeShape.getInstance(p, shapeSource, cache, shaclSail); + qualifiedValueShape = NodeShape.getInstance(p, shapeSource, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - qualifiedValueShape = PropertyShape.getInstance(p, shapeSource, cache, shaclSail); + qualifiedValueShape = PropertyShape.getInstance(p, shapeSource, parseSettings, cache); } else { throw new IllegalStateException("Unknown shape type for " + p.getId()); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMinCountConstraintComponent.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMinCountConstraintComponent.java index 24023c7fe3a..885acfad50c 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMinCountConstraintComponent.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/QualifiedMinCountConstraintComponent.java @@ -23,7 +23,6 @@ import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.eclipse.rdf4j.sail.shacl.ast.Cache; @@ -58,7 +57,8 @@ public class QualifiedMinCountConstraintComponent extends AbstractConstraintComp Long qualifiedMinCount; public QualifiedMinCountConstraintComponent(Resource id, ShapeSource shapeSource, - Cache cache, ShaclSail shaclSail, Boolean qualifiedValueShapesDisjoint, Long qualifiedMinCount) { + Shape.ParseSettings parseSettings, Cache cache, Boolean qualifiedValueShapesDisjoint, + Long qualifiedMinCount) { super(id); ShaclProperties p = new ShaclProperties(id, shapeSource); @@ -67,9 +67,9 @@ public QualifiedMinCountConstraintComponent(Resource id, ShapeSource shapeSource this.qualifiedMinCount = qualifiedMinCount; if (p.getType() == SHACL.NODE_SHAPE) { - qualifiedValueShape = NodeShape.getInstance(p, shapeSource, cache, shaclSail); + qualifiedValueShape = NodeShape.getInstance(p, shapeSource, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - qualifiedValueShape = PropertyShape.getInstance(p, shapeSource, cache, shaclSail); + qualifiedValueShape = PropertyShape.getInstance(p, shapeSource, parseSettings, cache); } else { throw new IllegalStateException("Unknown shape type for " + p.getId()); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/XoneConstraintComponent.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/XoneConstraintComponent.java index 857fc847ed9..1c37776eebb 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/XoneConstraintComponent.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/XoneConstraintComponent.java @@ -20,7 +20,6 @@ import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent; import org.eclipse.rdf4j.sail.shacl.ast.Cache; import org.eclipse.rdf4j.sail.shacl.ast.NodeShape; @@ -34,16 +33,17 @@ public class XoneConstraintComponent extends AbstractConstraintComponent { List xone; - public XoneConstraintComponent(Resource id, ShapeSource shapeSource, Cache cache, ShaclSail shaclSail) { + public XoneConstraintComponent(Resource id, ShapeSource shapeSource, Shape.ParseSettings parseSettings, + Cache cache) { super(id); xone = ShaclAstLists.toList(shapeSource, id, Resource.class) .stream() .map(r -> new ShaclProperties(r, shapeSource)) .map(p -> { if (p.getType() == SHACL.NODE_SHAPE) { - return NodeShape.getInstance(p, shapeSource, cache, shaclSail); + return NodeShape.getInstance(p, shapeSource, parseSettings, cache); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - return PropertyShape.getInstance(p, shapeSource, cache, shaclSail); + return PropertyShape.getInstance(p, shapeSource, parseSettings, cache); } throw new IllegalStateException("Unknown shape type for " + p.getId()); }) diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/AbstractBulkJoinPlanNode.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/AbstractBulkJoinPlanNode.java index 44fe28f5c9b..fda18eb1b72 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/AbstractBulkJoinPlanNode.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/AbstractBulkJoinPlanNode.java @@ -154,4 +154,5 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(mapper); } + } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/DatatypeFilter.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/DatatypeFilter.java index 003a496493c..4d5e99f7e25 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/DatatypeFilter.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/DatatypeFilter.java @@ -43,8 +43,7 @@ boolean checkTuple(ValidationTuple t) { Literal literal = (Literal) t.getValue(); if (xsdDatatype != null) { if (literal.getCoreDatatype() == xsdDatatype) { - boolean validValue = XMLDatatypeUtil.isValidValue(literal.stringValue(), xsdDatatype); - return validValue; + return XMLDatatypeUtil.isValidValue(literal.stringValue(), xsdDatatype); } return false; } else { diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/EmptyNode.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/EmptyNode.java index fee7bbac81b..737b0fb2a4d 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/EmptyNode.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/EmptyNode.java @@ -75,4 +75,9 @@ public boolean producesSorted() { public boolean requiresSorted() { return false; } + + @Override + public boolean isGuaranteedEmpty() { + return true; + } } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/PlanNode.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/PlanNode.java index dd6b36a4b00..173c96bdc39 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/PlanNode.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/PlanNode.java @@ -33,4 +33,8 @@ public interface PlanNode { boolean requiresSorted(); + default boolean isGuaranteedEmpty() { + return false; + } + } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/SingleCloseablePlanNode.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/SingleCloseablePlanNode.java index 5f150ec8b64..3ecaa66a2c9 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/SingleCloseablePlanNode.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/SingleCloseablePlanNode.java @@ -16,6 +16,7 @@ import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.eclipse.rdf4j.sail.SailException; +import org.eclipse.rdf4j.sail.shacl.ast.Shape; /** * A plan node that can only be closed once @@ -25,13 +26,17 @@ public class SingleCloseablePlanNode implements PlanNode { private final PlanNode parent; + private final Shape shape; + boolean receivedLogger = false; - public SingleCloseablePlanNode(PlanNode parent) { + public SingleCloseablePlanNode(PlanNode parent, Shape shape) { this.parent = PlanNodeHelper.handleSorting(this, parent); + this.shape = shape; } @Override public CloseableIteration iterator() { + assert receivedLogger; return new SingleCloseableIteration(parent); } @@ -57,6 +62,7 @@ public String getId() { @Override public void receiveLogger(ValidationExecutionLogger validationExecutionLogger) { + receivedLogger = true; parent.receiveLogger(validationExecutionLogger); } @@ -70,6 +76,10 @@ public boolean requiresSorted() { return false; } + public Shape getShape() { + return shape; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/UnionNode.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/UnionNode.java index 3046f116c4b..7c1c6237e03 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/UnionNode.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/UnionNode.java @@ -39,7 +39,7 @@ private UnionNode(PlanNode... nodes) { } public static PlanNode getInstance(PlanNode... nodes) { - PlanNode[] planNodes = Arrays.stream(nodes).filter(n -> !(n instanceof EmptyNode)).flatMap(n -> { + PlanNode[] planNodes = Arrays.stream(nodes).filter(n -> !(n.isGuaranteedEmpty())).flatMap(n -> { if (n instanceof UnionNode) { return Arrays.stream(((UnionNode) n).nodes); } @@ -58,7 +58,7 @@ public static PlanNode getInstance(PlanNode... nodes) { } public static PlanNode getInstanceDedupe(PlanNode... nodes) { - PlanNode[] planNodes = Arrays.stream(nodes).filter(n -> !(n instanceof EmptyNode)).distinct().flatMap(n -> { + PlanNode[] planNodes = Arrays.stream(nodes).filter(n -> !(n.isGuaranteedEmpty())).distinct().flatMap(n -> { if (n instanceof UnionNode) { return Arrays.stream(((UnionNode) n).nodes); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/Unique.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/Unique.java index abcf2b0dc38..75c916f72c4 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/Unique.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/Unique.java @@ -58,7 +58,7 @@ private Unique(PlanNode parent, boolean compress) { } public static PlanNode getInstance(PlanNode parent, boolean compress) { - if (parent == EmptyNode.getInstance()) { + if (parent.isGuaranteedEmpty()) { return parent; } return new Unique(parent, compress); diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/RSXTargetShape.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/RSXTargetShape.java index 23cb6076a29..1aa16e99456 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/RSXTargetShape.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/RSXTargetShape.java @@ -22,7 +22,6 @@ import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.vocabulary.RSX; import org.eclipse.rdf4j.model.vocabulary.SHACL; -import org.eclipse.rdf4j.sail.shacl.ShaclSail; import org.eclipse.rdf4j.sail.shacl.ast.Cache; import org.eclipse.rdf4j.sail.shacl.ast.NodeShape; import org.eclipse.rdf4j.sail.shacl.ast.PropertyShape; @@ -44,13 +43,13 @@ public class RSXTargetShape extends Target { private final Shape targetShape; - public RSXTargetShape(Resource targetShape, ShapeSource shapeSource, ShaclSail shaclSail) { + public RSXTargetShape(Resource targetShape, ShapeSource shapeSource, Shape.ParseSettings parseSettings) { ShaclProperties p = new ShaclProperties(targetShape, shapeSource); if (p.getType() == SHACL.NODE_SHAPE) { - this.targetShape = NodeShape.getInstance(p, shapeSource, new Cache(), shaclSail); + this.targetShape = NodeShape.getInstance(p, shapeSource, parseSettings, new Cache()); } else if (p.getType() == SHACL.PROPERTY_SHAPE) { - this.targetShape = PropertyShape.getInstance(p, shapeSource, new Cache(), shaclSail); + this.targetShape = PropertyShape.getInstance(p, shapeSource, parseSettings, new Cache()); } else { throw new IllegalStateException("Unknown shape type for " + p.getId()); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/ValidationResult.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/ValidationResult.java index 25c6b0876be..3827c9bd392 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/ValidationResult.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/ValidationResult.java @@ -189,6 +189,13 @@ public final Resource getId() { return id; } + /** + * @return conforms + */ + public boolean conforms() { + return severity != Severity.Violation; + } + /** * @return the type of the source constraint that caused the violation */ diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/LazyValidationReport.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/LazyValidationReport.java index 11d22135290..0bd778273d4 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/LazyValidationReport.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/LazyValidationReport.java @@ -13,7 +13,7 @@ import static org.eclipse.rdf4j.model.util.Values.literal; -import java.util.Arrays; +import java.io.StringWriter; import java.util.HashSet; import java.util.List; @@ -21,10 +21,20 @@ import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.impl.BooleanLiteral; +import org.eclipse.rdf4j.model.impl.DynamicModel; import org.eclipse.rdf4j.model.impl.DynamicModelFactory; +import org.eclipse.rdf4j.model.vocabulary.DASH; +import org.eclipse.rdf4j.model.vocabulary.OWL; import org.eclipse.rdf4j.model.vocabulary.RDF; import org.eclipse.rdf4j.model.vocabulary.RDF4J; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.model.vocabulary.RSX; import org.eclipse.rdf4j.model.vocabulary.SHACL; +import org.eclipse.rdf4j.model.vocabulary.XSD; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.Rio; +import org.eclipse.rdf4j.rio.WriterConfig; +import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings; import org.eclipse.rdf4j.sail.shacl.results.ValidationReport; import org.eclipse.rdf4j.sail.shacl.results.ValidationResult; @@ -86,7 +96,19 @@ public Model asModel(Model model) { } public Model asModel() { - return asModel(new DynamicModelFactory().createEmptyModel()); + DynamicModel emptyModel = new DynamicModelFactory().createEmptyModel(); + emptyModel.setNamespace(SHACL.NS); + emptyModel.setNamespace(RSX.NS); + emptyModel.setNamespace(DASH.NS); + + emptyModel.setNamespace(RDF.NS); + emptyModel.setNamespace(RDFS.NS); + emptyModel.setNamespace(OWL.NS); + emptyModel.setNamespace(XSD.NS); + + emptyModel.setNamespace(RDF4J.NS); + + return asModel(emptyModel); } /** @@ -107,10 +129,17 @@ public List getValidationResult() { @Override public String toString() { - return "LazyValidationReport{" + - "conforms=" + conforms + - ", validationResult=" + Arrays.toString(validationResult.toArray()) + - '}'; + StringWriter stringWriter = new StringWriter(); + + WriterConfig writerConfig = new WriterConfig() + .set(BasicWriterSettings.PRETTY_PRINT, true) + .set(BasicWriterSettings.INLINE_BLANK_NODES, true); + + Rio.write(asModel(), stringWriter, RDFFormat.TURTLE, writerConfig); + + return stringWriter.toString() + .replaceAll("(?m)^(@prefix)(.*)(\\.)$", "") // remove all lines that are prefix declarations + .trim(); } public boolean isTruncated() { diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/ValidationResultIterator.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/ValidationResultIterator.java index 1ed4020da6e..d84d659cabd 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/ValidationResultIterator.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/results/lazy/ValidationResultIterator.java @@ -22,6 +22,7 @@ import org.eclipse.rdf4j.common.iteration.CloseableIteration; import org.eclipse.rdf4j.common.iteration.CloseableIteratorIteration; import org.eclipse.rdf4j.sail.SailException; +import org.eclipse.rdf4j.sail.shacl.ast.Severity; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.ValidationTuple; import org.eclipse.rdf4j.sail.shacl.results.ValidationResult; @@ -30,30 +31,30 @@ public class ValidationResultIterator implements Iterator { private final long limit; private long counter = 0; - private boolean conforms = true; + private Boolean conforms = null; private boolean truncated = false; private Iterator next = Collections.emptyIterator(); private CloseableIteration tupleIterator; public ValidationResultIterator(CloseableIteration tupleIterator, - long limit) { + long limit, Severity severity) { this.limit = limit; this.tupleIterator = tupleIterator; + if (severity != Severity.Violation) { + conforms = true; + } getTuples(); } private void calculateNext() { - if (tupleIterator.hasNext()) { - conforms = false; - } if (next.hasNext()) { return; } if (tupleIterator.hasNext()) { - if (limit < 0 || counter < limit) { + if (limit < 0 || counter < limit || (counter == 0 && limit == 0)) { ValidationTuple invalidTuple = tupleIterator.next(); Set invalidTuples; @@ -68,36 +69,41 @@ private void calculateNext() { for (ValidationTuple tuple : invalidTuples) { List validationResults = tuple.getValidationResult(); + for (ValidationResult validationResult : validationResults) { + if (conforms == null && !validationResult.conforms()) { + conforms = false; + } + } ValidationResult validationResult1 = validationResults.get(validationResults.size() - 1); validationResultsRet.add(validationResult1); -// ValidationResult parent = null; -// -// // we iterate in reverse order to get the most recent validation result first -// for (int i = validationResults.size() - 1; i >= 0; i--) { -// ValidationResult validationResult = validationResults.get(i); -// if (parent == null) { -// parent = validationResult; -// validationResultsRet.add(parent); -// } else { -// parent.setDetail(validationResult); -// parent = validationResult; -// } -// } - counter++; } + if (conforms == null) { + conforms = true; + } - next = validationResultsRet.iterator(); + if (limit != 0) { + next = validationResultsRet.iterator(); + } } + if (limit == 0 && (counter > 0 || tupleIterator.hasNext())) { + truncated = true; + } + if (limit >= 0 && counter >= limit && tupleIterator.hasNext()) { truncated = true; } + } else { + if (conforms == null) { + conforms = true; + } } + } public List getTuples() { @@ -113,6 +119,7 @@ public List getTuples() { public boolean conforms() { calculateNext(); + assert conforms != null; return conforms; } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/ConnectionsGroup.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/ConnectionsGroup.java index 014bbf92f9f..55ee9b26455 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/ConnectionsGroup.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/ConnectionsGroup.java @@ -144,6 +144,8 @@ public PlanNode getCachedNodeFor(PlanNode planNode) { } public RdfsSubClassOfReasoner getRdfsSubClassOfReasoner() { + if (rdfsSubClassOfReasonerProvider == null) + return null; return rdfsSubClassOfReasonerProvider.getRdfsSubClassOfReasoner(); } diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/RdfsSubClassOfReasoner.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/RdfsSubClassOfReasoner.java index cd9dd5fcdb0..a0a3c48ceac 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/RdfsSubClassOfReasoner.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/data/RdfsSubClassOfReasoner.java @@ -30,7 +30,8 @@ import org.eclipse.rdf4j.model.vocabulary.RDF; import org.eclipse.rdf4j.model.vocabulary.RDF4J; import org.eclipse.rdf4j.model.vocabulary.RDFS; -import org.eclipse.rdf4j.sail.shacl.ShaclSailConnection; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.shacl.ValidationSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,27 +150,48 @@ private Set resolveTypes(Resource value, Map> return iris != null ? iris : Collections.emptySet(); } - public static RdfsSubClassOfReasoner createReasoner(ShaclSailConnection shaclSailConnection) { + public static RdfsSubClassOfReasoner createReasoner(SailConnection sailConnection, + ValidationSettings validationSettings) { + return createReasoner(sailConnection, null, validationSettings); + } + + public static RdfsSubClassOfReasoner createReasoner(SailConnection sailConnection, SailConnection secondConnection, + ValidationSettings validationSettings) { long before = 0; - if (shaclSailConnection.sail.isPerformanceLogging()) { + if (validationSettings.isPerformanceLogging()) { before = System.currentTimeMillis(); } RdfsSubClassOfReasoner rdfsSubClassOfReasoner = new RdfsSubClassOfReasoner(); - try (Stream stream = shaclSailConnection.getStatements(null, RDFS.SUBCLASSOF, null, false) + try (Stream stream = sailConnection.getStatements(null, RDFS.SUBCLASSOF, null, false) .stream()) { stream.forEach(rdfsSubClassOfReasoner::addSubClassOfStatement); } - try (Stream stream = shaclSailConnection + if (secondConnection != null) { + try (Stream stream = secondConnection.getStatements(null, RDFS.SUBCLASSOF, null, false) + .stream()) { + stream.forEach(rdfsSubClassOfReasoner::addSubClassOfStatement); + } + } + + try (Stream stream = sailConnection .getStatements(null, RDFS.SUBCLASSOF, null, false, RDF4J.SHACL_SHAPE_GRAPH) .stream()) { stream.forEach(rdfsSubClassOfReasoner::addSubClassOfStatement); } + if (secondConnection != null) { + try (Stream stream = secondConnection + .getStatements(null, RDFS.SUBCLASSOF, null, false, RDF4J.SHACL_SHAPE_GRAPH) + .stream()) { + stream.forEach(rdfsSubClassOfReasoner::addSubClassOfStatement); + } + } + rdfsSubClassOfReasoner.calculateSubClassOf(rdfsSubClassOfReasoner.subClassOfStatements); - if (shaclSailConnection.sail.isPerformanceLogging()) { + if (validationSettings.isPerformanceLogging()) { logger.info("RdfsSubClassOfReasoner.createReasoner() took {} ms", System.currentTimeMillis() - before); } return rdfsSubClassOfReasoner; diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/BackwardChainingShapeSource.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/BackwardChainingShapeSource.java index a29805da1bc..a0b02cc87b5 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/BackwardChainingShapeSource.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/BackwardChainingShapeSource.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.rdf4j.sail.shacl.wrapper.shape; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -20,6 +22,7 @@ import org.eclipse.rdf4j.model.util.Statements; import org.eclipse.rdf4j.model.vocabulary.DASH; import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDF4J; import org.eclipse.rdf4j.model.vocabulary.RDFS; import org.eclipse.rdf4j.model.vocabulary.SHACL; import org.eclipse.rdf4j.sail.SailConnection; @@ -50,11 +53,38 @@ public Resource[] getActiveContexts() { public Stream getAllShapeContexts() { assert context != null; + if (context.length == 0) { + // union context + try (Stream stream = connection + .getStatements(null, SHACL.SHAPES_GRAPH, null, false, context) + .stream()) { + + List collect = stream + .collect(Collectors.groupingBy(Statement::getSubject)) + .entrySet() + .stream() + .map(entry -> new ShapesGraph(entry.getKey(), entry.getValue())) + .collect(Collectors.toList()); + + collect = new ArrayList<>(); + collect.add(new ShapesGraph(RDF4J.NIL)); + + return collect.stream(); + + } + + } + try (Stream stream = connection .getStatements(null, SHACL.SHAPES_GRAPH, null, false, context) .stream()) { - return stream + List collect = stream.collect(Collectors.toList()); + + if (collect.size() > 0) { + System.out.println(); + } + return collect.stream() .collect(Collectors.groupingBy(Statement::getSubject)) .entrySet() .stream() diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/CombinedShapeSource.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/CombinedShapeSource.java index 545550af425..39565c63414 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/CombinedShapeSource.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/CombinedShapeSource.java @@ -27,6 +27,11 @@ public class CombinedShapeSource implements ShapeSource { private final BackwardChainingShapeSource baseSail; private final Resource[] context; + public CombinedShapeSource(SailConnection shapesForForwardChainingConnection, + SailConnection sailConnection) { + this(shapesForForwardChainingConnection, sailConnection, null); + } + public CombinedShapeSource(RepositoryConnection shapesForForwardChainingConnection, SailConnection sailConnection) { this(shapesForForwardChainingConnection, sailConnection, null); @@ -40,6 +45,14 @@ private CombinedShapeSource(RepositoryConnection shapesForForwardChainingConnect this.context = context; } + private CombinedShapeSource(SailConnection shapesForForwardChainingConnection, + SailConnection sailConnection, + Resource[] context) { + this.rdf4jShapesGraph = new ForwardChainingShapeSource(shapesForForwardChainingConnection); + this.baseSail = new BackwardChainingShapeSource(sailConnection); + this.context = context; + } + private CombinedShapeSource(ForwardChainingShapeSource rdf4jShapesGraph, BackwardChainingShapeSource baseSail, Resource[] context) { this.rdf4jShapesGraph = rdf4jShapesGraph; diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/ForwardChainingShapeSource.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/ForwardChainingShapeSource.java index 06855ab4b2a..dc2589b9376 100644 --- a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/ForwardChainingShapeSource.java +++ b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/wrapper/shape/ForwardChainingShapeSource.java @@ -15,6 +15,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; +import java.util.stream.Collectors; import java.util.stream.Stream; import org.eclipse.rdf4j.common.transaction.IsolationLevels; @@ -33,6 +34,7 @@ import org.eclipse.rdf4j.repository.sail.SailRepository; import org.eclipse.rdf4j.rio.RDFFormat; import org.eclipse.rdf4j.rio.Rio; +import org.eclipse.rdf4j.sail.SailConnection; import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer; import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencerConnection; import org.eclipse.rdf4j.sail.memory.MemoryStore; @@ -58,6 +60,17 @@ public ForwardChainingShapeSource(RepositoryConnection connection) { } + public ForwardChainingShapeSource(SailConnection connection) { + this.context = null; + + assert connection.isActive(); + + repository = forwardChain(connection); + this.connection = repository.getConnection(); + this.connection.begin(IsolationLevels.NONE); + + } + private ForwardChainingShapeSource(Repository repository, RepositoryConnection connection, Resource[] context) { this.connection = connection; @@ -89,6 +102,29 @@ private SailRepository forwardChain(RepositoryConnection shapesRepoConnection) { } } + private SailRepository forwardChain(SailConnection shapesRepoConnection) { + try (var statements = shapesRepoConnection.getStatements(null, null, null, false)) { + if (!statements.hasNext()) { + return new SailRepository(new MemoryStore()); + } + + SailRepository shapesRepoWithReasoning = new SailRepository( + SchemaCachingRDFSInferencer.fastInstantiateFrom(shaclVocabulary, new MemoryStore(), false)); + + try (var shapesRepoWithReasoningConnection = shapesRepoWithReasoning.getConnection()) { + shapesRepoWithReasoningConnection.begin(IsolationLevels.NONE); + + shapesRepoWithReasoningConnection.add(statements); + enrichShapes(shapesRepoWithReasoningConnection); + + shapesRepoWithReasoningConnection.commit(); + } + + return shapesRepoWithReasoning; + + } + } + private static SchemaCachingRDFSInferencer createShaclVocabulary() { try (InputStream in = getResourceAsStream("shacl-sparql-inference/shaclVocabulary.ttl")) { SchemaCachingRDFSInferencer schemaCachingRDFSInferencer = new SchemaCachingRDFSInferencer( @@ -133,9 +169,20 @@ private void enrichShapes(RepositoryConnection shaclSailConnection) { return; } - // TODO: We need to handle DASH_CONSTANTS for the other shape graphs too! - shaclSailConnection.add(DASH_CONSTANTS, RDF4J.SHACL_SHAPE_GRAPH); + shaclSailConnection.add(DASH_CONSTANTS); + shaclSailConnection.add(DASH_CONSTANTS, new Resource[] { null }); + + try (Stream stream = shaclSailConnection + .getStatements(null, SHACL.SHAPES_GRAPH, null, false) + .stream()) { + + stream.forEach(s -> { + shaclSailConnection.add(DASH_CONSTANTS, ((IRI) s.getObject())); + }); + + } + implicitTargetClass(shaclSailConnection); } @@ -166,10 +213,22 @@ public Resource[] getActiveContexts() { } public Stream getAllShapeContexts() { - if (connection.hasStatement(null, null, null, false, RDF4J.SHACL_SHAPE_GRAPH)) { + assert context != null; + + if (!connection.hasStatement(null, SHACL.SHAPES_GRAPH, null, false)) { return Stream.of(new ShapesGraph(RDF4J.SHACL_SHAPE_GRAPH)); } - return Stream.empty(); + + try (Stream stream = connection + .getStatements(null, SHACL.SHAPES_GRAPH, null, false, context) + .stream()) { + + return stream + .collect(Collectors.groupingBy(Statement::getSubject)) + .entrySet() + .stream() + .map(entry -> new ShapeSource.ShapesGraph(entry.getKey(), entry.getValue())); + } } diff --git a/core/sail/shacl/src/main/resources/shacl-sparql-inference/implicitTargetClassNodeShape.rq b/core/sail/shacl/src/main/resources/shacl-sparql-inference/implicitTargetClassNodeShape.rq deleted file mode 100644 index 333008a1004..00000000000 --- a/core/sail/shacl/src/main/resources/shacl-sparql-inference/implicitTargetClassNodeShape.rq +++ /dev/null @@ -1,18 +0,0 @@ -PREFIX owl: -PREFIX rdf: -PREFIX rdfs: -PREFIX sh: -PREFIX xsd: - - -insert { - - ?a sh:targetClass ?a ; - -} where { - - ?a - rdf:type rdfs:Class ; - rdf:type sh:NodeShape ; - . -} \ No newline at end of file diff --git a/core/sail/shacl/src/main/resources/shacl-sparql-inference/implicitTargetClassPropertyShape.rq b/core/sail/shacl/src/main/resources/shacl-sparql-inference/implicitTargetClassPropertyShape.rq deleted file mode 100644 index f57eacfb14d..00000000000 --- a/core/sail/shacl/src/main/resources/shacl-sparql-inference/implicitTargetClassPropertyShape.rq +++ /dev/null @@ -1,18 +0,0 @@ -PREFIX owl: -PREFIX rdf: -PREFIX rdfs: -PREFIX sh: -PREFIX xsd: - - -insert { - - ?a sh:targetClass ?a ; - -} where { - - ?a - rdf:type rdfs:Class ; - rdf:type sh:PropertyShape ; - . -} \ No newline at end of file diff --git a/core/sail/shacl/src/main/resources/shacl-sparql-inference/propertyShapeWithTarget.rq b/core/sail/shacl/src/main/resources/shacl-sparql-inference/propertyShapeWithTarget.rq deleted file mode 100644 index 652bc09223e..00000000000 --- a/core/sail/shacl/src/main/resources/shacl-sparql-inference/propertyShapeWithTarget.rq +++ /dev/null @@ -1,31 +0,0 @@ -PREFIX owl: -PREFIX rdf: -PREFIX rdfs: -PREFIX sh: -PREFIX xsd: - - -delete { - - ?a ?p ?target . -} - -insert { - - [ - a sh:NodeShape ; - ?p ?target ; - sh:property ?a ; - ] - -} - -where { - - ?a - sh:path ?path ; - ?p ?target ; - . - - FILTER(?p in (sh:targetClass, sh:targetNode, sh:targetSubjectsOf, sh:targetObjectsOf )) -} \ No newline at end of file diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java index 6cd92dd43c2..6b13c7a6ab0 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java @@ -81,6 +81,7 @@ import org.eclipse.rdf4j.sail.shacl.results.ValidationReport; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.params.provider.Arguments; import org.slf4j.Logger; @@ -287,6 +288,20 @@ private static List getTestsToRun() { return individualTestCases; } + @BeforeAll + static void beforeAll() { + IRI[] shapesGraphs = SHAPE_GRAPHS.stream() + .map(g -> { + if (g.equals(RDF4J.NIL)) { + return null; + } + return g; + }) + .toArray(IRI[]::new); + + ShaclValidator.CONTEXTS = shapesGraphs; + } + @AfterEach void tearDown() { fullLogging = false; @@ -390,6 +405,68 @@ private void printTestCase(TestCase testCase) { } + void runWithShaclValidator(TestCase testCase) { + + SailRepository shapesRepo = new SailRepository(new MemoryStore()); + SailRepository dataRepo = new SailRepository(new MemoryStore()); + + try { + + Utils.loadShapeData(shapesRepo, testCase.getShacl()); + if (testCase.hasInitialData()) { + Utils.loadInitialData(dataRepo, testCase.getInitialData()); + } + + for (File queryFile : testCase.getQueries()) { + try { + String query = FileUtils.readFileToString(queryFile, StandardCharsets.UTF_8); + + logger.debug(queryFile.getName()); + + try (SailRepositoryConnection connection = dataRepo.getConnection()) { + connection.prepareUpdate(query).execute(); + } catch (MalformedQueryException e) { + System.err.println(query + "\n"); + throw e; + } + + } catch (IOException e) { + e.printStackTrace(); + } + + } + + printTestCase(testCase); + + printCurrentState(dataRepo); + + ValidationReport validationReport1 = ShaclValidator.validate(dataRepo.getSail(), shapesRepo.getSail()); + + Assertions.assertEquals(testCase.expectedResult == ExpectedResult.valid, validationReport1.conforms(), + "Validation result does not match expected result"); + + ValidationReport validationReport2 = ShaclValidator.validate(dataRepo.getSail(), shapesRepo.getSail()); + + Assertions.assertEquals(testCase.expectedResult == ExpectedResult.valid, validationReport2.conforms(), + "Validation result does not match expected result"); + +// writeActualModelToExpectedModelForDevPurposes(testCase.testCasePath, validationReport1.asModel()); + + testValidationReport(testCase.testCasePath, validationReport1.asModel()); + testValidationReport(testCase.testCasePath, validationReport2.asModel()); + + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + try { + shapesRepo.shutDown(); + } finally { + dataRepo.shutDown(); + } + } + + } + private static void testValidationReport(String dataPath, Model validationReportActual) { try { InputStream resourceAsStream = getResourceAsStream(dataPath + "report.ttl"); @@ -894,9 +971,10 @@ void runTestCaseSingleTransaction(TestCase testCase) { "Expected validation to succeed for " + testCase.getTestCasePath()); } else { Assertions.assertTrue(exception, "Expected validation to fail for " + testCase.getTestCasePath()); + testValidationReport(testCase.testCasePath, validationReportActual); + } - testValidationReport(testCase.testCasePath, validationReportActual); } } finally { shaclRepository.shutDown(); @@ -942,14 +1020,11 @@ void runTestCaseRevalidate(TestCase testCase, IsolationLevel isolationLevel) { printResults(report); - if (!report.conforms()) { - testValidationReport(testCase.getTestCasePath(), report.asModel()); - } - if (testCase.getExpectedResult() == ExpectedResult.valid) { Assertions.assertTrue(report.conforms()); } else { Assertions.assertFalse(report.conforms()); + testValidationReport(testCase.getTestCasePath(), report.asModel()); } } finally { shaclRepository.shutDown(); diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoChangeTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoChangeTest.java index 31e64994e4b..a03b301368d 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoChangeTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoChangeTest.java @@ -54,7 +54,7 @@ public void testSkippingValidationWhenThereAreNoChanges() throws IOException, In ShaclSailConnection connectionSpy = Mockito.spy((ShaclSailConnection) connection); connectionSpy.begin(); connectionSpy.commit(); - verify(connectionSpy, never()).prepareValidation(); + verify(connectionSpy, never()).prepareValidation(new ValidationSettings()); } shaclSail.shutDown(); diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoShapesTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoShapesTest.java index c2a437aa237..291b87bf65c 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoShapesTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/NoShapesTest.java @@ -34,7 +34,7 @@ public void testSkippingValidationWhenThereAreNoShapes() throws InterruptedExcep connectionSpy.begin(); connectionSpy.addStatement(RDF.TYPE, RDF.TYPE, RDFS.RESOURCE); connectionSpy.commit(); - verify(connectionSpy, never()).prepareValidation(); + verify(connectionSpy, never()).prepareValidation(new ValidationSettings()); } try (SailConnection connection = shaclSail.getConnection()) { @@ -43,7 +43,7 @@ public void testSkippingValidationWhenThereAreNoShapes() throws InterruptedExcep connectionSpy.begin(); connectionSpy.addStatement(RDF.TYPE, RDF.TYPE, RDF.PROPERTY); connectionSpy.commit(); - verify(connectionSpy, never()).prepareValidation(); + verify(connectionSpy, never()).prepareValidation(new ValidationSettings()); } try (SailConnection connection = shaclSail.getConnection()) { @@ -53,7 +53,7 @@ public void testSkippingValidationWhenThereAreNoShapes() throws InterruptedExcep connectionSpy.addStatement(RDF.TYPE, RDF.TYPE, RDF.PREDICATE); connectionSpy.addStatement(RDF.TYPE, RDF.TYPE, RDFS.RESOURCE, RDF4J.SHACL_SHAPE_GRAPH); connectionSpy.commit(); - verify(connectionSpy, never()).prepareValidation(); + verify(connectionSpy, never()).prepareValidation(new ValidationSettings()); } shaclSail.shutDown(); diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/RdfsShaclConnectionTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/RdfsShaclConnectionTest.java index 39ca16e7ff0..4c2cc93bc78 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/RdfsShaclConnectionTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/RdfsShaclConnectionTest.java @@ -50,7 +50,7 @@ public void testHasStatement() { try (NotifyingSailConnection connection = shaclSail.getConnection()) { ((ShaclSailConnection) connection).rdfsSubClassOfReasoner = RdfsSubClassOfReasoner - .createReasoner((ShaclSailConnection) connection); + .createReasoner((ShaclSailConnection) connection, new ValidationSettings()); VerySimpleRdfsBackwardsChainingConnection connection2 = new VerySimpleRdfsBackwardsChainingConnection( connection, ((ShaclSailConnection) connection).getRdfsSubClassOfReasoner()); @@ -71,7 +71,7 @@ public void testGetStatement() { try (NotifyingSailConnection connection = shaclSail.getConnection()) { ((ShaclSailConnection) connection).rdfsSubClassOfReasoner = RdfsSubClassOfReasoner - .createReasoner((ShaclSailConnection) connection); + .createReasoner((ShaclSailConnection) connection, new ValidationSettings()); VerySimpleRdfsBackwardsChainingConnection connection2 = new VerySimpleRdfsBackwardsChainingConnection( connection, @@ -121,7 +121,7 @@ public void testGetStatementNoDuplicates() { connection.commit(); ((ShaclSailConnection) connection).rdfsSubClassOfReasoner = RdfsSubClassOfReasoner - .createReasoner((ShaclSailConnection) connection); + .createReasoner((ShaclSailConnection) connection, new ValidationSettings()); VerySimpleRdfsBackwardsChainingConnection connection2 = new VerySimpleRdfsBackwardsChainingConnection( connection, diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ReduceNumberOfPlansTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ReduceNumberOfPlansTest.java index fb9cf0e6194..7d97d9e12b1 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ReduceNumberOfPlansTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ReduceNumberOfPlansTest.java @@ -22,7 +22,6 @@ import org.eclipse.rdf4j.rio.RDFParseException; import org.eclipse.rdf4j.rio.UnsupportedRDFormatException; import org.eclipse.rdf4j.sail.memory.MemoryStore; -import org.eclipse.rdf4j.sail.shacl.ast.planNodes.EmptyNode; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.PlanNode; import org.eclipse.rdf4j.sail.shacl.wrapper.data.ConnectionsGroup; import org.junit.jupiter.api.Assertions; @@ -45,7 +44,7 @@ public void testAddingTypeStatement() try (ShaclSailConnection connection = (ShaclSailConnection) shaclSail.getConnection()) { connection.begin(); - connection.prepareValidation(); + connection.prepareValidation(new ValidationSettings()); try (ConnectionsGroup connectionsGroup = connection.getConnectionsGroup()) { @@ -54,7 +53,7 @@ public void testAddingTypeStatement() .stream() .flatMap(s -> s.getShapes().stream()) .map(shape -> shape.generatePlans(connectionsGroup, new ValidationSettings())) - .filter(s -> !(s instanceof EmptyNode)) + .filter(s -> !(s.isGuaranteedEmpty())) .collect(Collectors.toList()); Assertions.assertEquals(0, collect.size()); @@ -62,7 +61,7 @@ public void testAddingTypeStatement() IRI person1 = Utils.Ex.createIri(); connection.addStatement(person1, RDF.TYPE, Utils.Ex.Person); - connection.prepareValidation(); + connection.prepareValidation(new ValidationSettings()); try (ConnectionsGroup connectionsGroup = connection.getConnectionsGroup()) { @@ -71,7 +70,7 @@ public void testAddingTypeStatement() .stream() .flatMap(s -> s.getShapes().stream()) .map(shape -> shape.generatePlans(connectionsGroup, new ValidationSettings())) - .filter(s -> !(s instanceof EmptyNode)) + .filter(s -> !(s.isGuaranteedEmpty())) .collect(Collectors.toList()); Assertions.assertEquals(2, collect2.size()); @@ -115,7 +114,7 @@ public void testRemovingPredicate() connection.removeStatements(person1, Utils.Ex.ssn, vf.createLiteral("b")); - connection.prepareValidation(); + connection.prepareValidation(new ValidationSettings()); try (ConnectionsGroup connectionsGroup = connection.getConnectionsGroup()) { @@ -124,7 +123,7 @@ public void testRemovingPredicate() .stream() .flatMap(s -> s.getShapes().stream()) .map(shape -> shape.generatePlans(connectionsGroup, new ValidationSettings())) - .filter(s -> !(s instanceof EmptyNode)) + .filter(s -> !(s.isGuaranteedEmpty())) .collect(Collectors.toList()); Assertions.assertEquals(1, collect1.size()); @@ -132,7 +131,7 @@ public void testRemovingPredicate() connection.removeStatements(person1, Utils.Ex.ssn, vf.createLiteral("a")); - connection.prepareValidation(); + connection.prepareValidation(new ValidationSettings()); try (ConnectionsGroup connectionsGroup = connection.getConnectionsGroup()) { @@ -141,14 +140,14 @@ public void testRemovingPredicate() .stream() .flatMap(s -> s.getShapes().stream()) .map(shape -> shape.generatePlans(connectionsGroup, new ValidationSettings())) - .filter(s -> !(s instanceof EmptyNode)) + .filter(s -> !(s.isGuaranteedEmpty())) .collect(Collectors.toList()); Assertions.assertEquals(1, collect2.size()); } connection.removeStatements(person1, Utils.Ex.name, vf.createLiteral("c")); - connection.prepareValidation(); + connection.prepareValidation(new ValidationSettings()); try (ConnectionsGroup connectionsGroup = connection.getConnectionsGroup()) { @@ -157,7 +156,7 @@ public void testRemovingPredicate() .stream() .flatMap(s -> s.getShapes().stream()) .map(shape -> shape.generatePlans(connectionsGroup, new ValidationSettings())) - .filter(s -> !(s instanceof EmptyNode)) + .filter(s -> !(s.isGuaranteedEmpty())) .collect(Collectors.toList()); Assertions.assertEquals(2, collect3.size()); diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTest.java index e9bdeed3463..fdfcf614d4d 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTest.java @@ -56,4 +56,10 @@ public void testReferenceImplementation(TestCase testCase) { runWithAutomaticLogging(() -> referenceImplementationTestCaseValidation(testCase)); } + @ParameterizedTest + @MethodSource("testCases") + public void testShaclValidator(TestCase testCase) { + runWithAutomaticLogging(() -> runWithShaclValidator(testCase)); + } + } diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTestWithoutRdfsReasonerTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTestWithoutRdfsReasonerTest.java index f3890d4ad2b..25af6c098ec 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTestWithoutRdfsReasonerTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclTestWithoutRdfsReasonerTest.java @@ -45,6 +45,15 @@ public void testRevalidation(TestCase testCase, IsolationLevel isolationLevel) { runWithAutomaticLogging(() -> runTestCaseRevalidate(testCase, isolationLevel)); } + @ParameterizedTest + @MethodSource("testCases") + public void testShaclValidator(TestCase testCase) { + if (ignoredTest(testCase)) { + return; + } + runWithAutomaticLogging(() -> runWithShaclValidator(testCase)); + } + // Since we have disabled the RDFS reasoner we can't run the tests that require reasoning private static boolean ignoredTest(TestCase testCase) { return testCase.getTestCasePath().contains("/subclass"); diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclValidatorTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclValidatorTest.java new file mode 100644 index 00000000000..52e745f1355 --- /dev/null +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShaclValidatorTest.java @@ -0,0 +1,156 @@ +/******************************************************************************* + * Copyright (c) 2023 Eclipse RDF4J contributors. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Distribution License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + ******************************************************************************/ + +package org.eclipse.rdf4j.sail.shacl; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.io.StringReader; + +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.util.Values; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.sail.memory.MemoryStore; +import org.eclipse.rdf4j.sail.shacl.results.ValidationReport; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +/** + * @author Håvard Ottestad + */ +@Isolated +public class ShaclValidatorTest { + + @BeforeAll + static void afterAll() { + ShaclValidator.CONTEXTS = new Resource[] {}; + } + + @Test + public void testDefaultGraphIsUnionValid() throws Exception { + + SailRepository shapes = getShapes(null); + + SailRepository data = new SailRepository(new MemoryStore()); + + try (SailRepositoryConnection connection = data.getConnection()) { + connection.add(Values.iri("http://example.org", "person1"), RDF.TYPE, RDFS.RESOURCE); + connection.add(Values.iri("http://example.org", "person1"), RDFS.LABEL, Values.literal("label"), + Values.iri("http://example.org/g1")); + } + + ValidationReport validate = ShaclValidator.validate(data.getSail(), shapes.getSail()); + assertTrue(validate.conforms()); + } + + @Test + public void testDefaultGraphIsUnionFailureDefaultGraph() throws Exception { + + SailRepository shapes = getShapes(null); + + SailRepository data = new SailRepository(new MemoryStore()); + + try (SailRepositoryConnection connection = data.getConnection()) { + connection.add(Values.iri("http://example.org", "person1"), RDF.TYPE, RDFS.RESOURCE); + } + + ValidationReport validate = ShaclValidator.validate(data.getSail(), shapes.getSail()); + assertFalse(validate.conforms()); + } + + @Test + public void testDefaultGraphIsUnionWarningDefaultGraph() throws Exception { + + SailRepository shapes = getShapes("sh:Warning"); + + SailRepository data = new SailRepository(new MemoryStore()); + + try (SailRepositoryConnection connection = data.getConnection()) { + connection.add(Values.iri("http://example.org", "person1"), RDF.TYPE, RDFS.RESOURCE); + } + + ValidationReport validate = ShaclValidator.validate(data.getSail(), shapes.getSail()); + assertTrue(validate.conforms()); + assertEquals(1, validate.getValidationResult().size()); + } + + @Test + public void testDefaultGraphIsUnionInfoDefaultGraph() throws Exception { + + SailRepository shapes = getShapes("sh:Info"); + + SailRepository data = new SailRepository(new MemoryStore()); + + try (SailRepositoryConnection connection = data.getConnection()) { + connection.add(Values.iri("http://example.org", "person1"), RDF.TYPE, RDFS.RESOURCE); + } + + ValidationReport validate = ShaclValidator.validate(data.getSail(), shapes.getSail()); + assertTrue(validate.conforms()); + assertEquals(1, validate.getValidationResult().size()); + } + + @Test + public void testDefaultGraphIsUnionFailureNamedGraph() throws Exception { + + SailRepository shapes = getShapes(null); + + SailRepository data = new SailRepository(new MemoryStore()); + + try (SailRepositoryConnection connection = data.getConnection()) { + connection.add(Values.iri("http://example.org", "person1"), RDF.TYPE, RDFS.RESOURCE, + Values.iri("http://example.org/g1")); + } + + ValidationReport validate = ShaclValidator.validate(data.getSail(), shapes.getSail()); + assertFalse(validate.conforms()); + } + + private static SailRepository getShapes(String severity) throws IOException { + String turtleTemplate = "@base .\n" + + "@prefix ex: .\n" + + "@prefix owl: .\n" + + "@prefix rdf: .\n" + + "@prefix rdfs: .\n" + + "@prefix sh: .\n" + + "@prefix xsd: .\n" + + "@prefix rdf4j: .\n" + + "\n" + + "ex:PersonShape\n" + + "\ta sh:NodeShape ;\n" + + "\tsh:targetClass rdfs:Resource ;\n" + + "\tsh:property ex:PersonShapeProperty .\n" + + "\n" + + "\n" + + "ex:PersonShapeProperty\n" + + " sh:path rdfs:label ;\n" + + " %s" + + " sh:minCount 1 .\n"; + + String severityLine = severity != null ? "sh:severity " + severity + " ;\n" : ""; + String turtleString = String.format(turtleTemplate, severityLine); + + SailRepository shapes = new SailRepository(new MemoryStore()); + try (SailRepositoryConnection connection = shapes.getConnection()) { + connection.add(new StringReader(turtleString), RDFFormat.TURTLE); + } + return shapes; + } + +} diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShapesGraphTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShapesGraphTest.java index 00f4280178a..1180abbe78c 100644 --- a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShapesGraphTest.java +++ b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShapesGraphTest.java @@ -29,7 +29,6 @@ import org.eclipse.rdf4j.repository.sail.SailRepository; import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; import org.eclipse.rdf4j.sail.memory.MemoryStore; -import org.eclipse.rdf4j.sail.shacl.ast.planNodes.EmptyNode; import org.eclipse.rdf4j.sail.shacl.ast.planNodes.PlanNode; import org.eclipse.rdf4j.sail.shacl.wrapper.data.ConnectionsGroup; import org.junit.jupiter.api.Assertions; @@ -179,7 +178,7 @@ public void testValidationRequired() throws IOException, InterruptedException { connection.begin(); connection.addStatement(Values.bnode(), RDF.TYPE, FOAF.PERSON, data1); - connection.prepareValidation(); + connection.prepareValidation(new ValidationSettings()); try (ConnectionsGroup connectionsGroup = connection.getConnectionsGroup()) { @@ -188,7 +187,7 @@ public void testValidationRequired() throws IOException, InterruptedException { .stream() .flatMap(s -> s.getShapes().stream()) .map(shape -> shape.generatePlans(connectionsGroup, new ValidationSettings())) - .filter(s -> !(s instanceof EmptyNode)) + .filter(s -> !(s.isGuaranteedEmpty())) .collect(Collectors.toList()); Assertions.assertEquals(0, collect.size()); diff --git a/core/sail/shacl/src/test/resources/test-cases/and-or/datatypeNodeShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/and-or/datatypeNodeShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/and-or/datatypeNodeShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/and-or/datatypeNodeShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/allObjects/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/allSubjects/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/and2/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexPath/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/multipleClass/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/multipleClass/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/multipleClass/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/multipleClass/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case3/report.ttl index abb0ed68946..0ccf061ff49 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case3/report.ttl @@ -17,7 +17,7 @@ sh:resultPath ex:knows2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1fts8k5lqx4390; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e721475; sh:value ex:p2 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; @@ -26,11 +26,11 @@ sh:resultPath ex:knows2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1fts8k5lqx4390; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e721475; sh:value ex:p2 ] . -_:node1fts8k5lqx4390 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e721475 a sh:PropertyShape; sh:node [ a sh:NodeShape; sh:property [ a sh:PropertyShape; sh:path ex:knows3; diff --git a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case4/report.ttl index 150128e6363..4c719a7af42 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/invalid/case4/report.ttl @@ -17,7 +17,7 @@ sh:resultPath ex:knows2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1fts8k5lqx5263; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e721758; sh:value ex:p2 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; @@ -26,11 +26,11 @@ sh:resultPath ex:knows2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1fts8k5lqx5263; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e721758; sh:value ex:p2_1 ] . -_:node1fts8k5lqx5263 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e721758 a sh:PropertyShape; sh:node [ a sh:NodeShape; sh:property [ a sh:PropertyShape; sh:path ex:knows3; diff --git a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/nestedNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case8/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case8/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case9/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case9/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case9/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not/valid/case9/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/invalid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/invalid/case6/report.ttl index d21bedd1088..aa82632b7fe 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/invalid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/invalid/case6/report.ttl @@ -12,11 +12,11 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode _:23461d565b5dbf0f; + sh:focusNode _:6239013878d7f02e; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:PersonShape; - sh:value _:23461d565b5dbf0f + sh:value _:6239013878d7f02e ] . ex:PersonShape a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case8/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case8/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case9/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case9/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case9/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/not2/valid/case9/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notAnd/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/notNotSimple/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simple/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case13/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case13/report.ttl index 7fdd5b6f021..b8cc18c6641 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case13/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case13/report.ttl @@ -16,7 +16,7 @@ sh:resultPath ex:knows2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; - sh:sourceShape _:node1ftskin5gx8001; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e722498; sh:value ex:peter ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; @@ -24,10 +24,10 @@ sh:resultPath ex:knows2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; - sh:sourceShape _:node1ftskin5gx8001; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e722498; sh:value ex:peter ] . -_:node1ftskin5gx8001 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e722498 a sh:PropertyShape; sh:class ex:Person; sh:path ex:knows2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case8/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleNested/valid/case8/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/simpleTargetShape/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case2/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case2/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case3/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case3/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case4/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case4/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case5/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case5/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case6/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case6/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case7/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTarget/valid/case7/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case2/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case2/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case4/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case4/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case5/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case5/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case6/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case6/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case7/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case7/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case8/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case8/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case9/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case9/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case9/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/sparqlTargetNot/valid/case9/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/subclass/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/targetNode/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/validateTarget/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/class/validateTargetNot/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/class/validateTargetNot/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/class/validateTargetNot/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/class/validateTargetNot/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/dcat/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/foaf/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/foaf/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/foaf/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/foaf/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/mms/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/mms/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/mms/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/mms/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/sparqlTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/sparqlTarget/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/sparqlTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/sparqlTarget/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/invalid/case1/report.ttl index e56a9b31af0..50f08733282 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/invalid/case1/report.ttl @@ -13,30 +13,30 @@ sh:result [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; - sh:focusNode ; + sh:focusNode ; sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx46765 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e724768 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; - sh:focusNode ; + sh:focusNode ; sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx46765 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e724768 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; - sh:focusNode ; + sh:focusNode ; sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx46765 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e724768 ] . -_:node1fts8k5lqx46765 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e724768 a sh:PropertyShape; sh:path ; sh:qualifiedMaxCount 1; sh:qualifiedValueShape [ a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/complex/targetShapeAndQualifiedShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/allObjects/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/not/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNestedPropertyShape2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShape/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case8/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeAnd/valid/case8/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNodeShapeTargetShape/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notNot/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notSimpleNodeShape/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/notTargetShape/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/invalid/case2/report.ttl index 646a23b9488..bf9f6b699c8 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/invalid/case2/report.ttl @@ -12,7 +12,7 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson2; + sh:focusNode ex:validPerson1; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; @@ -20,7 +20,7 @@ sh:value "123" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; + sh:focusNode ex:validPerson2; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleDefaultGraph/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/invalid/case2/report.ttl index 102d438ef04..23bcfbd1456 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/invalid/case2/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:dataGraph ex:g1; rsx:shapesGraph ex:shapesGraph1; - sh:focusNode ex:validPerson2; + sh:focusNode ex:validPerson1; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; @@ -22,7 +22,7 @@ ], [ a sh:ValidationResult; rsx:dataGraph ex:g1; rsx:shapesGraph ex:shapesGraph1; - sh:focusNode ex:validPerson1; + sh:focusNode ex:validPerson2; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNamedGraph/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/invalid/case5/report.ttl index 7578b046a6d..37bdb1cda94 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/invalid/case5/report.ttl @@ -11,6 +11,13 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; + rsx:shapesGraph rdf4j:SHACLShapeGraph; + sh:focusNode ex:validPerson1; + sh:resultSeverity sh:Violation; + sh:sourceConstraintComponent sh:NodeConstraintComponent; + sh:sourceShape ex:PersonShape; + sh:value ex:validPerson1 + ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; sh:resultSeverity sh:Violation; @@ -26,11 +33,11 @@ sh:value ex:validPerson3 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; + sh:focusNode ex:validPerson5; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; sh:sourceShape ex:PersonShape; - sh:value ex:validPerson1 + sh:value ex:validPerson5 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson6; @@ -45,13 +52,6 @@ sh:sourceConstraintComponent sh:NodeConstraintComponent; sh:sourceShape ex:PersonShape; sh:value ex:validPerson7 - ], [ a sh:ValidationResult; - rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson5; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape ex:PersonShape; - sh:value ex:validPerson5 ] . ex:PersonShape a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/invalid/case5/report.ttl index a2ffa0dbfc7..8e82fa64da6 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/invalid/case5/report.ttl @@ -12,19 +12,19 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:b; + sh:focusNode ex:a; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; sh:value "1" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:c; + sh:focusNode ex:a; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; sh:value "8" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; @@ -32,82 +32,82 @@ sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "8" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "1" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:a; + sh:focusNode ex:b; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "1" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "9" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:c; + sh:focusNode ex:b; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "1" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "8" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:a; + sh:focusNode ex:c; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; sh:value "8" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:g; + sh:focusNode ex:c; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "z" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "9" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:e; + sh:focusNode ex:c; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "x" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "1" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:b; + sh:focusNode ex:d; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "9" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "x" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:d; + sh:focusNode ex:e; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; sh:value "x" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:c; + sh:focusNode ex:f; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; - sh:value "9" + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; + sh:value "z" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:f; + sh:focusNode ex:g; sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:node1ftskin5gx26269; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726146; sh:value "z" ] . -_:node1ftskin5gx26269 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e726146 a sh:PropertyShape; sh:datatype xsd:integer; sh:path ex:age . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNested2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNode/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/invalid/case4/report.ttl index abd7952e6b7..f1785bea478 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/invalid/case4/report.ttl @@ -12,63 +12,63 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson3; + sh:focusNode ex:validPerson1; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:c + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:a ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson7; + sh:focusNode ex:validPerson2; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:g + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:b ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson6; + sh:focusNode ex:validPerson3; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:e + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:c ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; + sh:focusNode ex:validPerson5; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:a + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:d ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson5; + sh:focusNode ex:validPerson6; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:d + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:e ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson2; + sh:focusNode ex:validPerson7; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:b + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:f ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson7; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeConstraintComponent; - sh:sourceShape _:node1ftskin5gx27217; - sh:value ex:f + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726388; + sh:value ex:g ] . -_:node1ftskin5gx27217 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e726388 a sh:PropertyShape; sh:node ex:node; sh:path ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/simpleNodeNested/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case2/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case2/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case3/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case3/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case4/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/sparqlTarget/valid/case4/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/invalid/case5/report.ttl index 0a4f358af4a..d774c476b82 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/invalid/case5/report.ttl @@ -16,7 +16,7 @@ sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f63896; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726656; sh:value "456" ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; @@ -24,10 +24,10 @@ sh:resultPath ex:age; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:DatatypeConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f63896; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e726656; sh:value "456" ] . -_:ebc83c7c91ca49f6a54b8e3d6925d2f63896 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e726656 a sh:PropertyShape; sh:datatype xsd:integer; sh:path ex:age . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNode/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNodeLang/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNodeLang/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetNodeLang/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetNodeLang/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetObjectsOf/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOf/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/datatype/targetSubjectsOfSingle/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/nodeshape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/or/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/deactivated/propertyshape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case4/report.ttl index 78ebf0131b3..3ddee21372c 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case4/report.ttl @@ -12,18 +12,18 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode 3; + sh:focusNode 2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; sh:sourceShape ex:IdAndUsernameAreBothFunctionalProperties; - sh:value 3 + sh:value 2 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode 2; + sh:focusNode 3; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; sh:sourceShape ex:IdAndUsernameAreBothFunctionalProperties; - sh:value 2 + sh:value 3 ] . ex:IdAndUsernameAreBothFunctionalProperties a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case5/report.ttl index 82f693608d1..cebe628da1f 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/invalid/case5/report.ttl @@ -12,18 +12,18 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode 2; + sh:focusNode 1; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; sh:sourceShape ex:IdAndUsernameAreBothFunctionalProperties; - sh:value 2 + sh:value 1 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode 1; + sh:focusNode 2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; sh:sourceShape ex:IdAndUsernameAreBothFunctionalProperties; - sh:value 1 + sh:value 2 ] . ex:IdAndUsernameAreBothFunctionalProperties a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctional/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctionalOr/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctionalOr/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctionalOr/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/multipleFunctionalOr/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case1/report.ttl index 96c796a887e..e948eb71ce5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case1/report.ttl @@ -13,13 +13,13 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode 1; - sh:resultPath _:node1ftskin5gx31661; + sh:resultPath _:5089a376325a403b926b5c31d5e95e727037; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MaxCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:maxCount 1; - sh:path _:node1ftskin5gx31661 + sh:path _:5089a376325a403b926b5c31d5e95e727037 ] ] . -_:node1ftskin5gx31661 sh:inversePath ex:id . +_:5089a376325a403b926b5c31d5e95e727037 sh:inversePath ex:id . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case2/report.ttl index 3ab0441dcb2..372e9b0c474 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/invalid/case2/report.ttl @@ -13,13 +13,13 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode 1; - sh:resultPath _:node1ftskin5gx31729; + sh:resultPath _:5089a376325a403b926b5c31d5e95e727275; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MaxCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:maxCount 1; - sh:path _:node1ftskin5gx31729 + sh:path _:5089a376325a403b926b5c31d5e95e727275 ] ] . -_:node1ftskin5gx31729 sh:inversePath ex:id . +_:5089a376325a403b926b5c31d5e95e727275 sh:inversePath ex:id . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/functionalProperty/singleFunctional/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case1/report.ttl index abe5519b357..c862a20b536 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case1/report.ttl @@ -16,19 +16,19 @@ sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; - sh:sourceShape _:node1ftskin5gx32255; - sh:value ex:peter + sh:sourceShape _:5089a376325a403b926b5c31d5e95e727355; + sh:value ex:steve ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; - sh:sourceShape _:node1ftskin5gx32255; - sh:value ex:steve + sh:sourceShape _:5089a376325a403b926b5c31d5e95e727355; + sh:value ex:peter ] . -_:node1ftskin5gx32255 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e727355 a sh:PropertyShape; sh:and ([ a sh:NodeShape; sh:hasValue ex:peter ] [ a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case2/report.ttl index 9f795dc6a45..751d5be6913 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/invalid/case2/report.ttl @@ -16,7 +16,7 @@ sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; - sh:sourceShape _:node1ftskin5gx32326; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e727373; sh:value ex:steve ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; @@ -24,11 +24,11 @@ sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:AndConstraintComponent; - sh:sourceShape _:node1ftskin5gx32326; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e727373; sh:value ex:peter ] . -_:node1ftskin5gx32326 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e727373 a sh:PropertyShape; sh:and ([ a sh:NodeShape; sh:hasValue ex:peter ] [ a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/and/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/and2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/not2/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/or/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/invalid/case4/report.ttl index 38e63bd2f8a..80a29f32beb 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/invalid/case4/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:HasValueConstraintComponent; - sh:sourceShape _:node1ftskin5gx35385 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e727886 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:HasValueConstraintComponent; - sh:sourceShape _:node1ftskin5gx35385 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e727886 ] . -_:node1ftskin5gx35385 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e727886 a sh:PropertyShape; sh:hasValue ex:peter; sh:path ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/simple/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case1/report.ttl index 5592a301ac6..8d1bf4084f3 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case1/report.ttl @@ -11,127 +11,28 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; + rsx:shapesGraph rdf4j:SHACLShapeGraph; + sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb34 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:node1fts8k5lqx28158; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb34 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:validPerson1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28158 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb34 ] . -_:node1fts8k5lqx28158 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb34 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case2/report.ttl index 1966ddd292f..7b50213a4ea 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case2/report.ttl @@ -11,119 +11,21 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb29 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:ebc83c7c91ca49f6a54b8e3d6925d2f64657; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f64657 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb29 ] . -_:ebc83c7c91ca49f6a54b8e3d6925d2f64657 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb29 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case3/report.ttl index 353214bb0ad..805b6faf3ef 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case3/report.ttl @@ -11,127 +11,21 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:node1fts8k5lqx28257; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode "blue"; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb42 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28257 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb42 ] . -_:node1fts8k5lqx28257 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb42 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case4/report.ttl index a65c7a8e271..f65544cfab4 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case4/report.ttl @@ -11,127 +11,21 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode "blue"; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:a; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb28 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:node1fts8k5lqx28303; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28303 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb28 ] . -_:node1fts8k5lqx28303 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb28 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case5/report.ttl index 368e76a9052..91533cfa43f 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case5/report.ttl @@ -11,127 +11,21 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode "blue"; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb33 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:node1fts8k5lqx28361; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28361 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb33 ] . -_:node1fts8k5lqx28361 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb33 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case6/report.ttl index ffbd7c49cb9..79aaa61985a 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case6/report.ttl @@ -11,127 +11,28 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:node1fts8k5lqx28590; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; + rsx:shapesGraph rdf4j:SHACLShapeGraph; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb39 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:Person; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb39 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28590 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb39 ] . -_:node1fts8k5lqx28590 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb39 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case7/report.ttl index c5531273005..dbabe767f56 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case7/report.ttl @@ -11,127 +11,21 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode rdf4j:nil; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info2; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:info; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode "blue"; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:shape1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode _:node1fts8k5lqx28636; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb43 ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode sh:NodeShape; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode []; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; + rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "purple"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 - ], [ a sh:ValidationResult; - rsx:dataGraph rdf4j:nil; - rsx:shapesGraph rdf4j:nil; - sh:focusNode 1; - sh:resultPath ex:info2; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx28636 + sh:sourceShape _:ed47f15bb61f49daac6e7c2a9e12edcb43 ] . -_:node1fts8k5lqx28636 a sh:PropertyShape; +_:ed47f15bb61f49daac6e7c2a9e12edcb43 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/shacl.trig b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/shacl.trig index f1894875af9..749b69bb889 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/shacl.trig +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/shacl.trig @@ -7,7 +7,7 @@ @prefix rsx: . @prefix rdf4j: . - { + rdf4j:SHACLShapeGraph { ex:shape1 a sh:NodeShape; rsx:targetShape [ sh:property [ @@ -22,6 +22,4 @@ sh:minCount 1 ] . - rdf4j:nil sh:shapesGraph rdf4j:nil. - } diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case1/report.ttl index 9602ff043a8..d9530f85e5f 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case1/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx35940 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728033 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx35940 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728033 ] . -_:node1ftskin5gx35940 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728033 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case2/report.ttl index 83e63bbe4c2..7eb6aa0d520 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case2/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx35969 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728173 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx35969 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728173 ] . -_:node1ftskin5gx35969 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728173 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case3/report.ttl index e252bf9e284..80de5abea9d 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd2/invalid/case3/report.ttl @@ -12,20 +12,20 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode "abc"; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx36023 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728250 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx36023 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728250 ] . -_:node1ftskin5gx36023 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728250 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd3/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case1/report.ttl index 8a5485ca46b..1d0ce4b0c35 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case1/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx36807 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728376 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx36807 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728376 ] . -_:node1ftskin5gx36807 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728376 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case2/report.ttl index e5b696f3a8e..b0f83d66a7b 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case2/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx36995 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728413 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx36995 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728413 ] . -_:node1ftskin5gx36995 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728413 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case3/report.ttl index 06dd6f3736b..b1541c70738 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr/invalid/case3/report.ttl @@ -12,20 +12,20 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode "abc"; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx37132 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728393 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx37132 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728393 ] . -_:node1ftskin5gx37132 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728393 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr3/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr3/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr3/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAndOr3/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case1/report.ttl index 3a191adeb6d..5522b1bc8c9 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case1/report.ttl @@ -12,27 +12,27 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx37984 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728616 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx37984 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728616 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx37984 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728616 ] . -_:node1ftskin5gx37984 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728616 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case2/report.ttl index c52cb547afb..875c6f315c4 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case2/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f65270 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728635 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f65270 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728635 ] . -_:ebc83c7c91ca49f6a54b8e3d6925d2f65270 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728635 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case3/report.ttl index c05050ba317..f63bb4f198b 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case3/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38092 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728402 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38092 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728402 ] . -_:node1ftskin5gx38092 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728402 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case4/report.ttl index 639a5fe5832..5d18adba62f 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case4/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38121 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728699 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38121 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728699 ] . -_:node1ftskin5gx38121 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728699 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case5/report.ttl index 751949c2898..fd637e02faf 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case5/report.ttl @@ -12,27 +12,27 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode "blue"; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38162 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728719 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38162 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728719 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38162 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728719 ] . -_:node1ftskin5gx38162 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728719 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case6/report.ttl index 31cbdd10e88..e454cee2517 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeOr/invalid/case6/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38261 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728799 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "purple"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx38261 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e728799 ] . -_:node1ftskin5gx38261 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e728799 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/and/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/not2/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/or/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/invalid/case4/report.ttl index 57cddfba999..da168e778b7 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/invalid/case4/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent ; - sh:sourceShape _:8f2287d42239400ab3f9bbfc68cbdd5121 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729379 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent ; - sh:sourceShape _:8f2287d42239400ab3f9bbfc68cbdd5121 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729379 ] . -_:8f2287d42239400ab3f9bbfc68cbdd5121 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729379 a sh:PropertyShape; (ex:peter ex:mary ex:kate); sh:path ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/simple/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case1/report.ttl index 6c7e5714807..652dcb13ff9 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case1/report.ttl @@ -16,23 +16,23 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42352 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729724 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42352 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729724 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42352 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729724 ] . -_:node1ftskin5gx42352 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729724 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case2/report.ttl index 7c3c6cc1e14..1f1e1cef408 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case2/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f65781 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729747 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:ebc83c7c91ca49f6a54b8e3d6925d2f65781 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729747 ] . -_:ebc83c7c91ca49f6a54b8e3d6925d2f65781 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729747 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case3/report.ttl index a0f41f9b8d2..b1117f48be1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case3/report.ttl @@ -12,20 +12,20 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42509 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729784 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42509 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729784 ] . -_:node1ftskin5gx42509 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729784 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case4/report.ttl index 81e8e780053..911359b4ccf 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case4/report.ttl @@ -12,20 +12,20 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:b; + sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42624 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729805 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; + sh:focusNode ex:b; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42624 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729805 ] . -_:node1ftskin5gx42624 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729805 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case5/report.ttl index 159d665b88f..11867006ebb 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case5/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42671 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729817 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42671 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729817 ] . -_:node1ftskin5gx42671 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729817 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case6/report.ttl index fe97beb90dd..acfc989bba8 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case6/report.ttl @@ -16,16 +16,16 @@ sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42708 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729869 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42708 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729869 ] . -_:node1ftskin5gx42708 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729869 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case7/report.ttl index a7222f4877d..7c28b8f7d06 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case7/report.ttl @@ -12,27 +12,27 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode "blue"; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42787 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729881 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode "abc"; + sh:focusNode "blue"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42787 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729881 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode "abc"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42787 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729881 ] . -_:node1ftskin5gx42787 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729881 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case8/report.ttl index 635f5ad71f5..4e6badb062c 100644 --- a/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/hasValueIn/targetShapeOr/invalid/case8/report.ttl @@ -12,20 +12,20 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode "purple"; + sh:focusNode ex:Person; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42869 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729654 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:Person; + sh:focusNode "purple"; sh:resultPath ex:info2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:node1ftskin5gx42869 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e729654 ] . -_:node1ftskin5gx42869 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e729654 a sh:PropertyShape; sh:minCount 1; sh:path ex:info2 . diff --git a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/implicitTargetClass/simpleDefaultGraph/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/notAnd/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/notOr/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case1/report.ttl index 803b16ce201..2bee6eaade1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case1/report.ttl @@ -18,7 +18,8 @@ sh:sourceConstraintComponent sh:InConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20); - sh:path ex:age + sh:path ex:age; + sh:severity sh:Violation ]; sh:value 123 ] . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case2/report.ttl index 803b16ce201..2bee6eaade1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case2/report.ttl @@ -18,7 +18,8 @@ sh:sourceConstraintComponent sh:InConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20); - sh:path ex:age + sh:path ex:age; + sh:severity sh:Violation ]; sh:value 123 ] . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case3/report.ttl index 803b16ce201..2bee6eaade1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case3/report.ttl @@ -18,7 +18,8 @@ sh:sourceConstraintComponent sh:InConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20); - sh:path ex:age + sh:path ex:age; + sh:severity sh:Violation ]; sh:value 123 ] . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case4/report.ttl index 803b16ce201..2bee6eaade1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case4/report.ttl @@ -18,7 +18,8 @@ sh:sourceConstraintComponent sh:InConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20); - sh:path ex:age + sh:path ex:age; + sh:severity sh:Violation ]; sh:value 123 ] . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case5/report.ttl index 803b16ce201..2bee6eaade1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case5/report.ttl @@ -18,7 +18,8 @@ sh:sourceConstraintComponent sh:InConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20); - sh:path ex:age + sh:path ex:age; + sh:severity sh:Violation ]; sh:value 123 ] . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case6/report.ttl index 33f4a579094..8467915a357 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/invalid/case6/report.ttl @@ -18,7 +18,8 @@ sh:sourceConstraintComponent sh:InConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20); - sh:path ex:age + sh:path ex:age; + sh:severity sh:Violation ]; sh:value [] ] . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/shacl.trig b/core/sail/shacl/src/test/resources/test-cases/in/simple/shacl.trig index 5d9394d072b..5a8a0bc66bd 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/shacl.trig +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/shacl.trig @@ -10,6 +10,7 @@ rdf4j:SHACLShapeGraph { ex:PersonShape a sh:NodeShape; sh:targetClass ex:Person; sh:property [ + sh:severity sh:Violation; sh:path ex:age; sh:in (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20) ], [ diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/in/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case8/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case8/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case8/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case8/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case9/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case9/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case9/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags/valid/case9/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/languageIn/subtags2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/nested/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/nestedCombination/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/invalid/case1/report.ttl index 0aaa9e77b27..dc61be468d1 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/invalid/case1/report.ttl @@ -11,6 +11,13 @@ rdf4j:truncated false; sh:conforms false; sh:result [ a sh:ValidationResult; + rsx:shapesGraph rdf4j:SHACLShapeGraph; + sh:focusNode ex:validPerson1; + sh:resultSeverity sh:Violation; + sh:sourceConstraintComponent sh:NotConstraintComponent; + sh:sourceShape ex:PersonShape; + sh:value ex:validPerson1 + ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; sh:resultSeverity sh:Violation; @@ -31,13 +38,6 @@ sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:PersonShape; sh:value ex:validPerson4 - ], [ a sh:ValidationResult; - rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson1; - sh:resultSeverity sh:Violation; - sh:sourceConstraintComponent sh:NotConstraintComponent; - sh:sourceShape ex:PersonShape; - sh:value ex:validPerson1 ] . ex:PersonShape a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/not2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/notNot/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case1/report.ttl index 34deb34045b..00372845ad8 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case1/report.ttl @@ -14,13 +14,13 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:node1fts8k5lqx46349; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212401; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MaxCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:maxCount 3; - sh:path _:node1fts8k5lqx46349 + sh:path _:5089a376325a403b926b5c31d5e95e7212401 ] ] . -_:node1fts8k5lqx46349 sh:inversePath ex:knows . +_:5089a376325a403b926b5c31d5e95e7212401 sh:inversePath ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case2/report.ttl index e3b32310ecc..9e4cca7b3bb 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case2/report.ttl @@ -14,13 +14,13 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:node1fts8k5lqx46431; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212316; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MaxCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:maxCount 3; - sh:path _:node1fts8k5lqx46431 + sh:path _:5089a376325a403b926b5c31d5e95e7212316 ] ] . -_:node1fts8k5lqx46431 sh:inversePath ex:knows . +_:5089a376325a403b926b5c31d5e95e7212316 sh:inversePath ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case3/report.ttl index fd3b3c34322..a1fabb3d208 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/invalid/case3/report.ttl @@ -14,13 +14,13 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:node1fts8k5lqx46514; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212414; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MaxCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:maxCount 3; - sh:path _:node1fts8k5lqx46514 + sh:path _:5089a376325a403b926b5c31d5e95e7212414 ] ] . -_:node1fts8k5lqx46514 sh:inversePath ex:knows . +_:5089a376325a403b926b5c31d5e95e7212414 sh:inversePath ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/simpleInversePath/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case2/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case2/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case3/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case3/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case4/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/sparqlTarget/valid/case4/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/targetNode/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxCount/zeroAndNegative/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxCount/zeroAndNegative/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxCount/zeroAndNegative/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxCount/zeroAndNegative/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxExclusive/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxExclusive/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxExclusive/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxExclusive/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxExclusiveMinLength/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxInclusive/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxInclusive/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxInclusive/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxInclusive/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/maxLength/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/minus1/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/minus1/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/minus1/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/minus1/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/not/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/not/invalid/case3/report.ttl index 0cb10776594..5bdb035b61e 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/not/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/not/invalid/case3/report.ttl @@ -13,11 +13,11 @@ sh:result [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; - sh:focusNode _:24b910351cf2aae6; + sh:focusNode _:29bf0cfaf52d3f0e; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:PersonShape; - sh:value _:24b910351cf2aae6 + sh:value _:29bf0cfaf52d3f0e ] . ex:PersonShape a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case1/report.ttl index f108927ad6c..77e85c62b56 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case1/report.ttl @@ -15,15 +15,15 @@ sh:focusNode ex:validPerson1; sh:resultMessage "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09515; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212924; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:message "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; sh:minCount 2; - sh:path _:bc1e3daa14e346808ddabb4154a9d09515 + sh:path _:5089a376325a403b926b5c31d5e95e7212924 ] ] . -_:bc1e3daa14e346808ddabb4154a9d09515 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . +_:5089a376325a403b926b5c31d5e95e7212924 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case2/report.ttl index e5b26fea3ae..96d29cb6eaf 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case2/report.ttl @@ -15,15 +15,15 @@ sh:focusNode ex:validPerson2; sh:resultMessage "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09523; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212939; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:message "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; sh:minCount 2; - sh:path _:bc1e3daa14e346808ddabb4154a9d09523 + sh:path _:5089a376325a403b926b5c31d5e95e7212939 ] ] . -_:bc1e3daa14e346808ddabb4154a9d09523 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . +_:5089a376325a403b926b5c31d5e95e7212939 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case3/report.ttl index 2f9dafee6d8..8a642bde19b 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case3/report.ttl @@ -15,15 +15,15 @@ sh:focusNode ex:validPerson1; sh:resultMessage "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09527; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212955; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:message "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; sh:minCount 2; - sh:path _:bc1e3daa14e346808ddabb4154a9d09527 + sh:path _:5089a376325a403b926b5c31d5e95e7212955 ] ] . -_:bc1e3daa14e346808ddabb4154a9d09527 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . +_:5089a376325a403b926b5c31d5e95e7212955 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case4/report.ttl index 5473e8bd615..889984468f4 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/invalid/case4/report.ttl @@ -15,15 +15,15 @@ sh:focusNode ex:validPerson1; sh:resultMessage "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09535; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212978; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:message "Requires at least 2 social security numbers"@en, "Trenger minst 2 fødselsnummer"@no-nb, "Requires at least 2 social security numbers"; sh:minCount 2; - sh:path _:bc1e3daa14e346808ddabb4154a9d09535 + sh:path _:5089a376325a403b926b5c31d5e95e7212978 ] ] . -_:bc1e3daa14e346808ddabb4154a9d09535 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . +_:5089a376325a403b926b5c31d5e95e7212978 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case6/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/simple/valid/case6/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case1/report.ttl index 82fae2e49e4..b547ae9475a 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case1/report.ttl @@ -13,21 +13,21 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09518; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212905; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:bc1e3daa14e346808ddabb4154a9d09516 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7212904 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09518; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7212905; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:bc1e3daa14e346808ddabb4154a9d09516 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7212904 ] . -_:bc1e3daa14e346808ddabb4154a9d09516 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e7212904 a sh:PropertyShape; sh:minCount 2; - sh:path _:bc1e3daa14e346808ddabb4154a9d09518 . + sh:path _:5089a376325a403b926b5c31d5e95e7212905 . -_:bc1e3daa14e346808ddabb4154a9d09518 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . +_:5089a376325a403b926b5c31d5e95e7212905 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case2/report.ttl index 9aa7a058db5..e36c1d4f095 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/invalid/case2/report.ttl @@ -13,21 +13,21 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09542; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213047; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:bc1e3daa14e346808ddabb4154a9d09541 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7213046 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; - sh:resultPath _:bc1e3daa14e346808ddabb4154a9d09542; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213047; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:MinCountConstraintComponent; - sh:sourceShape _:bc1e3daa14e346808ddabb4154a9d09541 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7213046 ] . -_:bc1e3daa14e346808ddabb4154a9d09541 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e7213046 a sh:PropertyShape; sh:minCount 2; - sh:path _:bc1e3daa14e346808ddabb4154a9d09542 . + sh:path _:5089a376325a403b926b5c31d5e95e7213047 . -_:bc1e3daa14e346808ddabb4154a9d09542 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . +_:5089a376325a403b926b5c31d5e95e7213047 sh:alternativePath (ex:ssn ex:socialSecurityNumber) . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/targetNode/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minCount/zero/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minCount/zero/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minCount/zero/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minCount/zero/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/dateVsTime/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/dateVsTime/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/dateVsTime/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/dateVsTime/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minExclusive/simple/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minInclusive/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minInclusive/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minInclusive/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minInclusive/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/minLength/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case2/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/multipleProperties/or/valid/case2/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/not/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/invalid/case1/report.ttl index c4786ee49c0..ee445d31dfd 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/invalid/case1/report.ttl @@ -13,14 +13,14 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:Peter; - sh:resultPath _:node1ftskin5gx57081; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213589; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeKindConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:nodeKind sh:IRI; - sh:path _:node1ftskin5gx57081 + sh:path _:5089a376325a403b926b5c31d5e95e7213589 ]; sh:value [] ] . -_:node1ftskin5gx57081 sh:inversePath ex:knows . +_:5089a376325a403b926b5c31d5e95e7213589 sh:inversePath ex:knows . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/simpleInversePath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/invalid/case1/report.ttl index 0d2304dcbfd..68a8e0be946 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/invalid/case1/report.ttl @@ -12,11 +12,11 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode _:622595bbfa4b52f6; + sh:focusNode _:54ef52ee27754ed1; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NodeKindConstraintComponent; sh:sourceShape ex:PersonShape; - sh:value _:622595bbfa4b52f6 + sh:value _:54ef52ee27754ed1 ] . ex:PersonShape a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/nodeKind/validateTarget/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class/invalid/case3/report.ttl index 78f80d77426..6dd2882c683 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class/invalid/case3/report.ttl @@ -12,20 +12,20 @@ sh:conforms false; sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson5; + sh:focusNode ex:validPerson2; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:OrConstraintComponent; sh:sourceShape ex:personShapeOr; - sh:value ex:a + sh:value ex:d ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:validPerson2; + sh:focusNode ex:validPerson5; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:OrConstraintComponent; sh:sourceShape ex:personShapeOr; - sh:value ex:d + sh:value ex:a ] . ex:personShapeOr a sh:PropertyShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2/invalid/case3/report.ttl index a132a6a88ce..f9743f1c965 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2/invalid/case3/report.ttl @@ -13,21 +13,21 @@ sh:result [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:validPerson5; + sh:focusNode ex:validPerson2; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; - sh:value ex:a + sh:value ex:d ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; - sh:focusNode ex:validPerson2; + sh:focusNode ex:validPerson5; sh:resultPath ex:knows; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; - sh:value ex:d + sh:value ex:a ] . ex:personShapeOr a sh:PropertyShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case1/report.ttl index 95f4ba5ccb9..b49fb49bccb 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case1/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:node1ftskin5gx58130; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213899; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; @@ -32,6 +32,6 @@ ex:personShapeOr a sh:PropertyShape; ] ]) ]; - sh:path _:node1ftskin5gx58130 . + sh:path _:5089a376325a403b926b5c31d5e95e7213899 . -_:node1ftskin5gx58130 sh:inversePath ex:inverseKnows . +_:5089a376325a403b926b5c31d5e95e7213899 sh:inversePath ex:inverseKnows . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case2/report.ttl index 61d5c06ccbb..9333a3158bf 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case2/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:node1ftskin5gx58201; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213909; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; @@ -21,7 +21,7 @@ ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:node1ftskin5gx58201; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213909; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; @@ -40,6 +40,6 @@ ex:personShapeOr a sh:PropertyShape; ] ]) ]; - sh:path _:node1ftskin5gx58201 . + sh:path _:5089a376325a403b926b5c31d5e95e7213909 . -_:node1ftskin5gx58201 sh:inversePath ex:inverseKnows . +_:5089a376325a403b926b5c31d5e95e7213909 sh:inversePath ex:inverseKnows . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case3/report.ttl index 2a150000547..a6e563c403f 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/invalid/case3/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson2; - sh:resultPath _:node1ftskin5gx58268; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213692; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; @@ -21,7 +21,7 @@ ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson5; - sh:resultPath _:node1ftskin5gx58268; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7213692; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:personShapeOr; @@ -40,6 +40,6 @@ ex:personShapeOr a sh:PropertyShape; ] ]) ]; - sh:path _:node1ftskin5gx58268 . + sh:path _:5089a376325a403b926b5c31d5e95e7213692 . -_:node1ftskin5gx58268 sh:inversePath ex:inverseKnows . +_:5089a376325a403b926b5c31d5e95e7213692 sh:inversePath ex:inverseKnows . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/class2InversePath/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/classValidateTarget/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatype/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatype/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatype/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatype/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatype2/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatype2/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatype2/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatype2/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatypeDifferentPaths/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatypeNodeShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatypeNodeShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatypeNodeShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatypeNodeShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/datatypeTargetNode/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/datatypeTargetNode/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/datatypeTargetNode/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/datatypeTargetNode/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/implicitAnd/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case1/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case1/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case2/report.ttl index e69de29bb2d..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/implicitAndSparqlTarget/valid/case2/report.ttl @@ -0,0 +1,12 @@ +@prefix ex: . +@prefix foaf: . +@prefix xsd: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . +@prefix rsx: . +@prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/inheritance-deep/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/inheritance-deep/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/inheritance-deep/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/inheritance-deep/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/inheritance/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/inheritance/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/inheritance/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/inheritance/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/inheritanceNodeShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/inheritanceNodeShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/inheritanceNodeShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/inheritanceNodeShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/maxCount/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCount/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountDifferentPath/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/minCountMaxCount/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/multiple/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/multiple/invalid/case1/report.ttl index 35d041c0542..9b60544b47b 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/multiple/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/multiple/invalid/case1/report.ttl @@ -17,7 +17,7 @@ sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:OrConstraintComponent; sh:sourceShape ex:personShapeOr; - sh:value ex:fluffy + sh:value ex:pete ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; @@ -25,7 +25,7 @@ sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:OrConstraintComponent; sh:sourceShape ex:personShapeOr; - sh:value ex:pete + sh:value ex:fluffy ] . ex:personShapeOr a sh:PropertyShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/or/multiple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/multiple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/multiple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/multiple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/invalid/case4/report.ttl index 39af6561b72..892f060ae36 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/invalid/case4/report.ttl @@ -16,7 +16,7 @@ sh:resultPath ex:iriOrMinLength5String; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:OrConstraintComponent; - sh:sourceShape _:node1ftskin5gx64166; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7215198; sh:value [] ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; @@ -24,11 +24,11 @@ sh:resultPath ex:iriOrMinLength5String; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:OrConstraintComponent; - sh:sourceShape _:node1ftskin5gx64166; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7215198; sh:value [] ] . -_:node1ftskin5gx64166 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e7215198 a sh:PropertyShape; sh:or ([ a sh:NodeShape; sh:nodeKind sh:IRI ] [ a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindMinLength/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/or/nodeKindValidateTarget/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case1/report.ttl index 36957d23143..55af7fddbad 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case1/report.ttl @@ -14,14 +14,14 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:0f8b81647a134a6bb28413b31e2679f79084; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7215305; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:class ex:Person; - sh:path _:0f8b81647a134a6bb28413b31e2679f79084 + sh:path _:5089a376325a403b926b5c31d5e95e7215305 ]; sh:value ex:peter ] . -_:0f8b81647a134a6bb28413b31e2679f79084 sh:alternativePath (ex:knows ex:knows2) . +_:5089a376325a403b926b5c31d5e95e7215305 sh:alternativePath (ex:knows ex:knows2) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case2/report.ttl index 296904792b4..353175be1ce 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case2/report.ttl @@ -14,14 +14,14 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:e009e77d2c3f4a1d84019ecc9f2da3ad5800; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7215122; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:class ex:Person; - sh:path _:e009e77d2c3f4a1d84019ecc9f2da3ad5800 + sh:path _:5089a376325a403b926b5c31d5e95e7215122 ]; sh:value ex:peter ] . -_:e009e77d2c3f4a1d84019ecc9f2da3ad5800 sh:alternativePath (ex:knows ex:knows2) . +_:5089a376325a403b926b5c31d5e95e7215122 sh:alternativePath (ex:knows ex:knows2) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case3/report.ttl index 8265f6a7e1c..0e2472e2537 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case3/report.ttl @@ -14,24 +14,24 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:8ae5a7bf85784cc9a613380eedb6118c10782; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7215316; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; - sh:sourceShape _:8ae5a7bf85784cc9a613380eedb6118c10781; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7215315; sh:value ex:peter ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:8ae5a7bf85784cc9a613380eedb6118c10782; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7215316; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; - sh:sourceShape _:8ae5a7bf85784cc9a613380eedb6118c10781; + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7215315; sh:value ex:jane ] . -_:8ae5a7bf85784cc9a613380eedb6118c10781 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e7215315 a sh:PropertyShape; sh:class ex:Person; - sh:path _:8ae5a7bf85784cc9a613380eedb6118c10782 . + sh:path _:5089a376325a403b926b5c31d5e95e7215316 . -_:8ae5a7bf85784cc9a613380eedb6118c10782 sh:alternativePath (ex:knows ex:knows2) . +_:5089a376325a403b926b5c31d5e95e7215316 sh:alternativePath (ex:knows ex:knows2) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case4/report.ttl index 296904792b4..41efaf79889 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/invalid/case4/report.ttl @@ -14,14 +14,14 @@ rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:nil; sh:focusNode ex:validPerson1; - sh:resultPath _:e009e77d2c3f4a1d84019ecc9f2da3ad5800; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7215347; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:ClassConstraintComponent; sh:sourceShape [ a sh:PropertyShape; sh:class ex:Person; - sh:path _:e009e77d2c3f4a1d84019ecc9f2da3ad5800 + sh:path _:5089a376325a403b926b5c31d5e95e7215347 ]; sh:value ex:peter ] . -_:e009e77d2c3f4a1d84019ecc9f2da3ad5800 sh:alternativePath (ex:knows ex:knows2) . +_:5089a376325a403b926b5c31d5e95e7215347 sh:alternativePath (ex:knows ex:knows2) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/alternativePath/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/minCount/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMaxCount/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notMinCount/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case11/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case11/report.ttl index 6577db607c7..4e233e48483 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case11/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case11/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:e235ce35cda24e10be9cbe4a444512138893; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7216617; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape [ a sh:PropertyShape; @@ -27,9 +27,9 @@ ] ex:age) ] ]; - sh:path _:e235ce35cda24e10be9cbe4a444512138893 + sh:path _:5089a376325a403b926b5c31d5e95e7216617 ]; sh:value [] ] . -_:e235ce35cda24e10be9cbe4a444512138893 sh:alternativePath (ex:altPath0 ex:altPath1) . +_:5089a376325a403b926b5c31d5e95e7216617 sh:alternativePath (ex:altPath0 ex:altPath1) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case12/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case12/report.ttl index dcbcb483ffb..34a2438fc11 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case12/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case12/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:e235ce35cda24e10be9cbe4a444512138597; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7216084; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape [ a sh:PropertyShape; @@ -27,9 +27,9 @@ ] ex:age) ] ]; - sh:path _:e235ce35cda24e10be9cbe4a444512138597 + sh:path _:5089a376325a403b926b5c31d5e95e7216084 ]; sh:value [] ] . -_:e235ce35cda24e10be9cbe4a444512138597 sh:alternativePath (ex:altPath0 ex:altPath1) . +_:5089a376325a403b926b5c31d5e95e7216084 sh:alternativePath (ex:altPath0 ex:altPath1) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case13/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case13/report.ttl index 1915517ea44..3ff9c3ff474 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case13/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case13/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:e235ce35cda24e10be9cbe4a444512138640; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7216171; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape [ a sh:PropertyShape; @@ -27,9 +27,9 @@ ] ex:age) ] ]; - sh:path _:e235ce35cda24e10be9cbe4a444512138640 + sh:path _:5089a376325a403b926b5c31d5e95e7216171 ]; sh:value [] ] . -_:e235ce35cda24e10be9cbe4a444512138640 sh:alternativePath (ex:altPath0 ex:altPath1) . +_:5089a376325a403b926b5c31d5e95e7216171 sh:alternativePath (ex:altPath0 ex:altPath1) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case14/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case14/report.ttl index 5337cb0a717..e6ad91c76b0 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case14/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/invalid/case14/report.ttl @@ -13,7 +13,7 @@ sh:result [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:validPerson1; - sh:resultPath _:e235ce35cda24e10be9cbe4a444512138935; + sh:resultPath _:5089a376325a403b926b5c31d5e95e7216112; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape [ a sh:PropertyShape; @@ -27,9 +27,9 @@ ] ex:age) ] ]; - sh:path _:e235ce35cda24e10be9cbe4a444512138935 + sh:path _:5089a376325a403b926b5c31d5e95e7216112 ]; sh:value [] ] . -_:e235ce35cda24e10be9cbe4a444512138935 sh:alternativePath (ex:altPath0 ex:altPath1) . +_:5089a376325a403b926b5c31d5e95e7216112 sh:alternativePath (ex:altPath0 ex:altPath1) . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/notNestedPropertyShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/path/sequencePath/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/multiple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/pattern/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/propertyShapeWithTarget/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/propertyShapeWithTarget/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/propertyShapeWithTarget/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/propertyShapeWithTarget/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/invalid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/invalid/case3/report.ttl index b4562d14af7..50e51574a06 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/invalid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/invalid/case3/report.ttl @@ -17,7 +17,7 @@ sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx89052 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7217106 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:SHACLShapeGraph, rdf4j:nil; @@ -25,7 +25,7 @@ sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx89052 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7217106 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:SHACLShapeGraph, rdf4j:nil; @@ -33,7 +33,7 @@ sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx89052 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7217106 ], [ a sh:ValidationResult; rsx:dataGraph rdf4j:nil; rsx:shapesGraph rdf4j:SHACLShapeGraph, rdf4j:nil; @@ -41,10 +41,10 @@ sh:resultPath ; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:QualifiedMaxCountConstraintComponent; - sh:sourceShape _:node1fts8k5lqx89052 + sh:sourceShape _:5089a376325a403b926b5c31d5e95e7217106 ] . -_:node1fts8k5lqx89052 a sh:PropertyShape; +_:5089a376325a403b926b5c31d5e95e7217106 a sh:PropertyShape; sh:path ; sh:qualifiedMaxCount 1; sh:qualifiedValueShape [ a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/complex/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/maxCountSimple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/qualifiedShape/minCountSimple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case1/report.ttl index b0e6918d665..e8bab6266a6 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case1/report.ttl @@ -16,17 +16,17 @@ sh:resultMessage "Values are literals with German language tag."; sh:resultPath ex:germanLabel; sh:resultSeverity sh:Violation; - sh:sourceConstraint _:91b2e40ac2c64832aec972d52e78054612574; + sh:sourceConstraint _:5089a376325a403b926b5c31d5e95e7218012; sh:sourceConstraintComponent sh:SPARQLConstraintComponent; sh:sourceShape ex:LanguageExampleShape; sh:value "Spain"@en ] . ex:LanguageExampleShape a sh:NodeShape; - sh:sparql _:91b2e40ac2c64832aec972d52e78054612574; + sh:sparql _:5089a376325a403b926b5c31d5e95e7218012; sh:targetClass ex:Country . -_:91b2e40ac2c64832aec972d52e78054612574 a sh:SPARQLConstraint; +_:5089a376325a403b926b5c31d5e95e7218012 a sh:SPARQLConstraint; sh:deactivated false; sh:message "Values are literals with German language tag."; sh:prefixes ; diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case2/report.ttl index ef213b76227..4ed52be496e 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/invalid/case2/report.ttl @@ -16,17 +16,17 @@ sh:resultMessage "Values are literals with German language tag."; sh:resultPath ex:germanLabel; sh:resultSeverity sh:Violation; - sh:sourceConstraint _:91b2e40ac2c64832aec972d52e78054612582; + sh:sourceConstraint _:5089a376325a403b926b5c31d5e95e7218023; sh:sourceConstraintComponent sh:SPARQLConstraintComponent; sh:sourceShape ex:LanguageExampleShape; sh:value "Spain"@en ] . ex:LanguageExampleShape a sh:NodeShape; - sh:sparql _:91b2e40ac2c64832aec972d52e78054612582; + sh:sparql _:5089a376325a403b926b5c31d5e95e7218023; sh:targetClass ex:Country . -_:91b2e40ac2c64832aec972d52e78054612582 a sh:SPARQLConstraint; +_:5089a376325a403b926b5c31d5e95e7218023 a sh:SPARQLConstraint; sh:deactivated false; sh:message "Values are literals with German language tag."; sh:prefixes ; diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsNodeShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case1/report.ttl index 4563ffccad3..1515c96427a 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case1/report.ttl @@ -16,7 +16,7 @@ sh:resultMessage "Values are literals with German language tag."; sh:resultPath ex:germanLabel; sh:resultSeverity sh:Violation; - sh:sourceConstraint _:91b2e40ac2c64832aec972d52e78054613392; + sh:sourceConstraint _:5089a376325a403b926b5c31d5e95e7218178; sh:sourceConstraintComponent sh:SPARQLConstraintComponent; sh:sourceShape ex:LanguageExamplePropertyShape; sh:value "Spain"@en @@ -24,10 +24,10 @@ ex:LanguageExamplePropertyShape a sh:PropertyShape; sh:path ex:germanLabel; - sh:sparql _:91b2e40ac2c64832aec972d52e78054613392; + sh:sparql _:5089a376325a403b926b5c31d5e95e7218178; sh:targetClass ex:Country . -_:91b2e40ac2c64832aec972d52e78054613392 a sh:SPARQLConstraint; +_:5089a376325a403b926b5c31d5e95e7218178 a sh:SPARQLConstraint; sh:message "Values are literals with German language tag."; sh:prefixes ; sh:select """ diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case2/report.ttl index 7d411e36c1d..017c2d1bdec 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/invalid/case2/report.ttl @@ -16,7 +16,7 @@ sh:resultMessage "Values are literals with German language tag."; sh:resultPath ex:germanLabel; sh:resultSeverity sh:Violation; - sh:sourceConstraint _:91b2e40ac2c64832aec972d52e78054613140; + sh:sourceConstraint _:5089a376325a403b926b5c31d5e95e7218429; sh:sourceConstraintComponent sh:SPARQLConstraintComponent; sh:sourceShape ex:LanguageExamplePropertyShape; sh:value "Spain"@en @@ -24,10 +24,10 @@ ex:LanguageExamplePropertyShape a sh:PropertyShape; sh:path ex:germanLabel; - sh:sparql _:91b2e40ac2c64832aec972d52e78054613140; + sh:sparql _:5089a376325a403b926b5c31d5e95e7218429; sh:targetClass ex:Country . -_:91b2e40ac2c64832aec972d52e78054613140 a sh:SPARQLConstraint; +_:5089a376325a403b926b5c31d5e95e7218429 a sh:SPARQLConstraint; sh:message "Values are literals with German language tag."; sh:prefixes ; sh:select """ diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/constraintsPropertyShape/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/sparql/negation/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/invalid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/invalid/case6/report.ttl index 521b1352c74..9268e20feb3 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/invalid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/invalid/case6/report.ttl @@ -19,11 +19,11 @@ sh:value ex:bigCo1 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:bigCo4; + sh:focusNode ex:bigCo2; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:PersonShape; - sh:value ex:bigCo4 + sh:value ex:bigCo2 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; sh:focusNode ex:bigCo3; @@ -33,11 +33,11 @@ sh:value ex:bigCo3 ], [ a sh:ValidationResult; rsx:shapesGraph rdf4j:SHACLShapeGraph; - sh:focusNode ex:bigCo2; + sh:focusNode ex:bigCo4; sh:resultSeverity sh:Violation; sh:sourceConstraintComponent sh:NotConstraintComponent; sh:sourceShape ex:PersonShape; - sh:value ex:bigCo2 + sh:value ex:bigCo4 ] . ex:PersonShape a sh:NodeShape; diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case3/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case3/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case3/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/not/valid/case3/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case1/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case1/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case1/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case1/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case2/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case2/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case2/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case2/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case4/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case4/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case4/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case4/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case5/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case5/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case5/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case5/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case6/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case6/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case6/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case6/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case7/report.ttl b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case7/report.ttl index 78bdbf9c261..c0518dc88b5 100644 --- a/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case7/report.ttl +++ b/core/sail/shacl/src/test/resources/test-cases/uniqueLang/simple/valid/case7/report.ttl @@ -6,3 +6,7 @@ @prefix rdfs: . @prefix rsx: . @prefix rdf4j: . + +[] a sh:ValidationReport; + rdf4j:truncated false; + sh:conforms true . diff --git a/core/sail/solr/pom.xml b/core/sail/solr/pom.xml index c5fdd751b51..7e07b79eb9f 100644 --- a/core/sail/solr/pom.xml +++ b/core/sail/solr/pom.xml @@ -47,18 +47,6 @@ - - - org.slf4j - log4j-over-slf4j - true - - - - org.apache.logging.log4j - log4j-to-slf4j - true -