Fixing Constraint checks for #68 and #72

Author: sebbader

validator/src/main/resources/constraint_shapes.ttl

@@ -880,16 +880,16 @@ aas:ConceptDescriptionWithCategoryDocumentAndIEC61360CorrectDataType a sh:NodeSh
   sh:targetClass aas:ConceptDescription;
   sh:sparql [
   a sh:SPARQLConstraint ;
-  sh:message "For a ConceptDescription with category DOCUMENT using data specification template IEC61360 (http://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/2/0) - DataSpecificationIEC61360/dataType shall be one of the following values: String or Url." ;
+  sh:message "For a ConceptDescription with category DOCUMENT using data specification template IEC61360 (http://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/2/0) - DataSpecificationIEC61360/dataType shall be one of the following values: String or URL." ;
 
   sh:select """
   	SELECT ?conceptDescription
   		WHERE {
 			?element a <https://admin-shell.io/aas/3/0/RC01/ConceptDescription> .
 			?conceptDescription <https://admin-shell.io/aas/3/0/RC01/Referable/category> "DOCUMENT" .
 			?conceptDescription <https://admin-shell.io/aas/3/0/RC01/HasDataSpecification/embeddedDataSpecification> ?embeddedDataSpecification .
-			?embeddedDataSpecification <https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent> <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/DataSpecificationIEC61360> .
-			<https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/DataSpecificationIEC61360> <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/DataSpecificationIEC61360/dataType> ?dataType .
+			?embeddedDataSpecification <https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent> ?dataSpecification .
+			?dataSpecification <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/DataSpecificationIEC61360/dataType> ?dataType .
 			FILTER(?dataType != <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/URL> && ?dataType != <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/String>)
 		}
         """ ;

validator/src/test/java/io/adminshell/aas/v3/model/validator/TestAASd_068.java

@@ -88,7 +88,7 @@ public void wrongConceptDescriptionDatatype() throws ValidationException {
 		} catch (ValidationException e) {
 			assertTrue(e.getMessage().endsWith("If the semanticId of a Range submodel element references a " +
 							"ConceptDescription then DataSpecificationIEC61360/dataType shall be a numerical one, i.e. " +
-							"REAL_* or RATIONAL_*."));
+							"Real* or Rational*."));
 		}
 
 

validator/src/test/java/io/adminshell/aas/v3/model/validator/TestAASd_072.java

@@ -68,7 +68,7 @@ public void wrongDataType() {
 			fail();
 		} catch (ValidationException e) {
 			assertTrue(e.getMessage().endsWith(
-					"For a ConceptDescription with category DOCUMENT using data specification template IEC61360 (http://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/2/0) - DataSpecificationIEC61360/dataType shall be one of the following values: STRING or URL."));
+					"For a ConceptDescription with category DOCUMENT using data specification template IEC61360 (http://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/2/0) - DataSpecificationIEC61360/dataType shall be one of the following values: String or URL."));
 		}
 	}