Fix broken test models

Author: atextor

core/sds-aspect-model-validator/src/test/java/io/openmanufacturing/sds/aspectmodel/validation/services/AspectModelValidatorTest.java

@@ -19,6 +19,7 @@
 import java.util.Collection;
 
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.topbraid.shacl.vocabulary.SH;
 
@@ -59,6 +60,33 @@ public void testValidAspect( final KnownVersion metaModelVersion ) {
       assertThat( result.getValidationErrors() ).hasSize( 0 );
    }
 
+   @ParameterizedTest
+   @EnumSource( value = TestAspect.class, mode = EnumSource.Mode.EXCLUDE, names = {
+         "ASPECT_WITH_CONSTRAINTS",
+         // uses bamm-c:OPEN which is not specified, see https://github.com/OpenManufacturingPlatform/sds-bamm-aspect-meta-model/issues/174
+         "ASPECT_WITH_FIXED_POINT",
+         "ASPECT_WITH_FIXED_POINT_CONSTRAINT",
+         "ASPECT_WITH_LANGUAGE_CONSTRAINT",
+         "ASPECT_WITH_RANGE_CONSTRAINT_ON_CONSTRAINED_NUMERIC_TYPE", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITHOUT_MIN_MAX_DOUBLE_VALUE", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITHOUT_MIN_MAX_INTEGER_VALUE", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_LOWER_BOUND", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_LOWER_BOUND_INCL_BOUND_DEFINITION", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_MIN_VALUE", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_UPPER_BOUND", // uses bamm-c:OPEN
+         "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_UPPER_BOUND_INCL_BOUND_DEFINITION" // uses bamm-c:OPEN
+   } )
+   public void testValidateTestAspectModel( final TestAspect testAspect ) {
+      final Try<VersionedModel> tryModel = TestResources.getModel( testAspect, KnownVersion.getLatest() );
+      final VersionedModel versionedModel = tryModel.get();
+
+      final ValidationReport report = service.validate( tryModel );
+      if ( !report.conforms() ) {
+         report.getValidationErrors().forEach( System.out::println );
+      }
+      assertThat( report.conforms() ).isTrue();
+   }
+
    @ParameterizedTest
    @MethodSource( value = "versionsUpToIncluding1_0_0" )
    public void testInvalidAspectMissingProperties( final KnownVersion metaModelVersion ) {

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithConstraint.ttl

@@ -78,8 +78,8 @@
    bamm:description "Test Constraint"@en ;
    bamm-c:constraint [
       a bamm-c:RangeConstraint ;
-      bamm-c:minValue "10"^^xsd:int ;
-      bamm-c:maxValue "15"^^xsd:int ;
+      bamm-c:minValue "10"^^xsd:integer ;
+      bamm-c:maxValue "15"^^xsd:integer ;
       bamm-c:upperBoundDefinition bamm-c:AT_MOST ;
       bamm-c:lowerBoundDefinition bamm-c:AT_LEAST ;
    ] ;
@@ -90,8 +90,8 @@
    bamm:description "Test Constraint"@en ;
    bamm-c:constraint [
       a bamm-c:RangeConstraint ;
-      bamm-c:minValue "100"^^xsd:int ;
-      bamm-c:maxValue "112"^^xsd:int ;
+      bamm-c:minValue "100"^^xsd:float ;
+      bamm-c:maxValue "112"^^xsd:float ;
       bamm-c:upperBoundDefinition bamm-c:AT_MOST ;
       bamm-c:lowerBoundDefinition bamm-c:AT_LEAST ;
    ] ;

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithEvent.ttl

@@ -25,7 +25,7 @@
 :SomeEvent a bamm:Event ;
    bamm:preferredName "Some Event"@en ;
    bamm:description "This is some event"@en ;
-   bamm:properties ( :testProperty ) .
+   bamm:parameters ( :testProperty ) .
 
 :testProperty a bamm:Property ;
    bamm:preferredName "Test Property"@en ;

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithFixedPoint.ttl

@@ -31,8 +31,8 @@
       bamm:preferredName "Test Fixed Point"@en ;
       bamm:description "This is a test fixed point constraint."@en ;
       bamm:see <http://example.com/omp> ;
-      bamm-c:scale "5"^^xsd:nonNegativeInteger ;
-      bamm-c:integer "3"^^xsd:nonNegativeInteger ;
+      bamm-c:scale "5"^^xsd:positiveInteger ;
+      bamm-c:integer "3"^^xsd:positiveInteger ;
    ] ;
    bamm-c:baseCharacteristic :Measurement .
 

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithFixedPointConstraint.ttl

@@ -31,8 +31,8 @@
       bamm:preferredName "Test Fixed Point"@en ;
       bamm:description "This is a test fixed point constraint."@en ;
       bamm:see <http://example.com/omp> ;
-      bamm-c:scale "5"^^xsd:nonNegativeInteger ;
-      bamm-c:integer "3"^^xsd:nonNegativeInteger ;
+      bamm-c:scale "5"^^xsd:positiveInteger ;
+      bamm-c:integer "3"^^xsd:positiveInteger ;
    ] ;
    bamm-c:baseCharacteristic :Measurement .
 

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithLanguageConstraint.ttl

@@ -36,6 +36,6 @@
       bamm:preferredName "Test Language Constraint"@en ;
       bamm:description "This is a test language constraint."@en ;
       bamm:see <http://example.com/omp> ;
-      bamm-c:languageCode "de-DE" ;
+      bamm-c:languageCode "de" ;
    ] ;
    bamm-c:baseCharacteristic bamm-c:Text .

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithStringEnumeration.ttl

@@ -21,8 +21,6 @@
    bamm:operations ( ) .
 
 :enumerationProperty a bamm:Property ;
-   bamm:preferredName ""@en ;
-   bamm:description ""@en ;
    bamm:characteristic [
      a bamm-c:Enumeration ;
      bamm:dataType xsd:string ;

core/sds-test-aspect-models/src/main/resources/valid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/AspectWithUsedAndUnusedEither.ttl

@@ -58,7 +58,7 @@
    bamm:see <http://example.com/me> ;
    bamm:dataType xsd:float .
 
-:UnusedRightType a bamm:Characteristic ;
+:NonUsedRightType a bamm:Characteristic ;
    bamm:preferredName "Right Type"@en ;
    bamm:description "Right Type Characteristic"@en ;
    bamm:see <http://example.com/omp> ;