Merge pull request #136 from bci-oss/135-properties-and-operations-not-mandatory-any-more

Make presence of `bamm:properties` and `bamm:operations` optional

Author: atextor

core/sds-aspect-meta-model-java/src/test/java/io/openmanufacturing/sds/metamodel/loader/AspectMetaModelInstantiatorTest.java

@@ -14,13 +14,15 @@
 package io.openmanufacturing.sds.metamodel.loader;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
 import org.apache.jena.vocabulary.XSD;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
@@ -40,6 +42,13 @@
 import io.openmanufacturing.sds.test.TestModel;
 
 public class AspectMetaModelInstantiatorTest extends MetaModelInstantiatorTest {
+   @ParameterizedTest
+   @EnumSource( value = TestAspect.class )
+   public void testLoadAspectExpectSuccess( final TestAspect aspect ) {
+      assertThatCode( () ->
+            loadAspect( aspect, KnownVersion.getLatest() )
+      ).doesNotThrowAnyException();
+   }
 
    @ParameterizedTest
    @MethodSource( value = "allVersions" )

core/sds-aspect-model-serializer/src/test/java/io/openmanufacturing/sds/aspectmodel/serializer/RdfModelCreatorVisitorTest.java

@@ -42,13 +42,18 @@ public class RdfModelCreatorVisitorTest extends MetaModelVersions {
     * Exclude the test models that contain unused elements; the resulting serialized models can
     * never be identical to the original because the unused elements are ignored when loading the
     * model and can therefore not be serialized.
+    * Furthermore, exclude the test model of an Aspect without bamm:properties and bamm:operations,
+    * since the serialization will always write "bamm:properties ()" (i.e., add the attribute with
+    * an empty list as value) for now, so here the serialization will differ from the source model
+    * as well.
     */
    @EnumSource( value = TestAspect.class, mode = EnumSource.Mode.EXCLUDE, names = {
          "ASPECT_WITH_USED_AND_UNUSED_CHARACTERISTIC",
          "ASPECT_WITH_USED_AND_UNUSED_COLLECTION",
          "ASPECT_WITH_USED_AND_UNUSED_CONSTRAINT",
          "ASPECT_WITH_USED_AND_UNUSED_EITHER",
-         "ASPECT_WITH_USED_AND_UNUSED_ENUMERATION"
+         "ASPECT_WITH_USED_AND_UNUSED_ENUMERATION",
+         "ASPECT_WITHOUT_PROPERTIES_AND_OPERATIONS"
    } )
    public void testRdfModelCreatorVisitor( final TestAspect aspect ) {
       testRdfCreation( aspect, KnownVersion.getLatest() );

core/sds-test-aspect-models/src/main/java/io/openmanufacturing/sds/test/TestAspect.java

@@ -18,6 +18,7 @@
 public enum TestAspect implements TestModel {
    ASPECT,
    ASPECT_WITHOUT_LANGUAGE_TAGS,
+   ASPECT_WITHOUT_PROPERTIES_AND_OPERATIONS,
    ASPECT_WITHOUT_SEE_ATTRIBUTE,
    ASPECT_WITH_ABSTRACT_ENTITY,
    ASPECT_WITH_COLLECTION_WITH_ABSTRACT_ENTITY,

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

@@ -0,0 +1,18 @@
+# Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix : <urn:bamm:io.openmanufacturing.test:1.0.0#> .
+@prefix bamm: <urn:bamm:io.openmanufacturing:meta-model:2.0.0#> .
+@prefix bamm-c: <urn:bamm:io.openmanufacturing:characteristic:2.0.0#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:AspectWithoutPropertiesAndOperations a bamm:Aspect ;
+   bamm:name "AspectWithBoolean" .