Fix broken units tests

Author: atextor

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/AbstractConstraint2BoxModelTest.java

@@ -29,14 +29,14 @@ public abstract class AbstractConstraint2BoxModelTest extends MetaModelVersions
 
    protected String boxSelectorStatement( final KnownVersion metaModelVersion, final String constraintIdentifier ) {
       if ( metaModelVersion.isNewerThan( KnownVersion.BAMM_1_0_0 ) ) {
-         return String.format( ":%s a :Box", constraintIdentifier );
+         return String.format( "%s a :Box", constraintIdentifier.equals( "*" ) ? "*" : ":" + constraintIdentifier );
       }
       return ":TestConstraintConstraint a :Box";
    }
 
    protected String entriesSelectorStatement( final KnownVersion metaModelVersion, final String constraintIdentifier ) {
       if ( metaModelVersion.isNewerThan( KnownVersion.BAMM_1_0_0 ) ) {
-         return String.format( ":%s :entries *", constraintIdentifier );
+         return String.format( "%s :entries *", constraintIdentifier.equals( "*" ) ? "*" : ":" + constraintIdentifier );
       }
       return ":TestConstraintConstraint :entries *";
    }

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/Aspect2BoxModelTest.java

@@ -129,10 +129,10 @@ public void testAspectWithOptionalPropertyWithPayloadName( final KnownVersion me
          qexec.execConstruct( queryResult );
       }
 
-      assertThat( queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyAspect_To_testPropertyProperty a :Edge" ) )
+      assertThat( queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyWithPayloadNameAspect_To_testPropertyProperty a :Edge" ) )
             .toList() ).hasSize( 1 );
       assertThat(
-            queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyAspect_To_testPropertyProperty :title property (optional) (test)" ) )
+            queryResult.listStatements( context.selector( ":AspectWithOptionalPropertyWithPayloadNameAspect_To_testPropertyProperty :title property (optional) (test)" ) )
                   .toList() ).hasSize( 1 );
    }
 }

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/Constraint2BoxModelTest.java

@@ -50,7 +50,7 @@ public void testOnlyUsedConstraintsAreProcessedExpectSuccess( final KnownVersion
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testSeeAttributeIsPresentExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "LengthConstraint294de3c";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_CONSTRAINT_WITH_SEE_ATTRIBUTE, metaModelVersion );
       context.executeAttributeIsPresentTest( sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
             entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -60,7 +60,7 @@ public void testSeeAttributeIsPresentExpectSuccess( final KnownVersion metaModel
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testSeeAttributesArePresentExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "LengthConstraintc82ebce";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_CONSTRAINT_WITH_MULTIPLE_SEE_ATTRIBUTES, metaModelVersion );
       context.executeAttributeIsPresentTest(
             sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ), entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -73,7 +73,7 @@ sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifie
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testSeeAttributeIsNotPresentExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "LengthConstraint125edc1";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_CONSTRAINT_WITHOUT_SEE_ATTRIBUTE, metaModelVersion );
       context.executeAttributeIsNotPresentTest( sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
             entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -83,7 +83,7 @@ public void testSeeAttributeIsNotPresentExpectSuccess( final KnownVersion metaMo
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testRegularExpressionConstraintExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "RegularExpressionConstraint44300e9";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_NUMERIC_REGULAR_EXPRESSION_CONSTRAINT, metaModelVersion );
       context.executeAttributeIsPresentTest(
             sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ), entriesSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -95,7 +95,7 @@ sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifie
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testFixedPointConstraintExpectSuccess( final KnownVersion metaModelVersion ) {
-      final String constraintIdentifier = "FixedPointConstraintd050140";
+      final String constraintIdentifier = "*";
       final TestContext context = new TestContext( TestAspect.ASPECT_WITH_FIXED_POINT_CONSTRAINT, metaModelVersion );
       context.executeAttributeIsPresentTest(
             sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ), entriesSelectorStatement( metaModelVersion, constraintIdentifier ),

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/docu/AspectModelDocumentationGeneratorTest.java

@@ -121,7 +121,7 @@ public void testEncodedTextIsNotDecoded( final KnownVersion metaModelVersion ) t
    @MethodSource( "allVersions" )
    public void testAspectModelUrnIsDisplayed( final KnownVersion metaModelVersion ) throws IOException {
       assertThat( generateHtmlDocumentation( TestAspect.ASPECT_WITH_HTML_TAGS, metaModelVersion ) )
-            .contains( "urn:bamm:io.openmanufacturing.test:1.0.0#AspectWithHTMLTags" );
+            .contains( "urn:bamm:io.openmanufacturing.test:1.0.0#AspectWithHtmlTags" );
    }
 
    @ParameterizedTest

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

@@ -14,8 +14,8 @@
 @prefix bamm-c: <urn:bamm:io.openmanufacturing:characteristic:1.0.0#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-:AspectWithHTMLTags a bamm:Aspect ;
-   bamm:name "AspectWithHTMLTags" ;
+:AspectWithHtmlTags a bamm:Aspect ;
+   bamm:name "AspectWithHtmlTags" ;
    bamm:preferredName "Aspect With <img src=xss.png onerror=alert('Boom!')> Entity"@en ;
    bamm:description "Aspect With <p>inside html tag</p> Entity"@en ;
    bamm:properties ( :testEntity ) ;

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

@@ -15,8 +15,8 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix unit: <urn:bamm:io.openmanufacturing:unit:1.0.0#> .
 
-:AspectWithOptionalProperty a bamm:Aspect ;
-   bamm:name "AspectWithOptionalProperty" ;
+:AspectWithOptionalPropertyWithPayloadName a bamm:Aspect ;
+   bamm:name "AspectWithOptionalPropertyWithPayloadName" ;
    bamm:preferredName "Test Aspect"@en ;
    bamm:description "This is a test description"@en ;
    bamm:see <http://example.com/omp> ;

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

@@ -90,8 +90,8 @@
    bamm:description "Test Constraint"@en ;
    bamm-c:constraint [
       a bamm-c:RangeConstraint ;
-      bamm-c:minValue "100"^^xsd:float ;
-      bamm-c:maxValue "112"^^xsd:float ;
+      bamm-c:minValue "100.0"^^xsd:float ;
+      bamm-c:maxValue "112.0"^^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/AspectWithConstraintWithSeeAttribute.ttl

@@ -41,7 +41,6 @@
       bamm:preferredName "Test Constraint Two"@en ;
       bamm:description "Test Constraint Two"@en ;
       bamm:see <http://example.com/omp> ;
-      bamm:see <http://example.com/me> ;
       bamm-c:minValue "5"^^xsd:nonNegativeInteger ;
       bamm-c:maxValue "10"^^xsd:nonNegativeInteger ;
    ] ;