Merge pull request #285 from bci-oss/284-include-bamme-in-meta-model-resolution

Add missing entity URLs in meta model resolver

Author: atextor

core/sds-aspect-meta-model-resolver/src/main/java/io/openmanufacturing/sds/aspectmodel/resolver/services/ClassPathMetaModelUrnResolver.java

@@ -35,6 +35,8 @@ public Set<URL> apply( final KnownVersion metaModelVersion ) {
             MetaModelUrls.url( "characteristic", metaModelVersion, "characteristic-definitions.ttl" ),
             MetaModelUrls.url( "characteristic", metaModelVersion, "characteristic-instances.ttl" ),
             MetaModelUrls.url( "entity", metaModelVersion, "TimeSeriesEntity.ttl" ),
+            MetaModelUrls.url( "entity", metaModelVersion, "FileResource.ttl" ),
+            MetaModelUrls.url( "entity", metaModelVersion, "Point3d.ttl" ),
             MetaModelUrls.url( "unit", metaModelVersion, "units.ttl" ),
             Optional.<URL> empty()
       ).filter( Optional::isPresent ).map( Optional::get ).collect( Collectors.toSet() );

core/sds-aspect-meta-model-resolver/src/test/java/io/openmanufacturing/sds/aspectmodel/resolver/services/ClassPathMetaModelUrnResolverTest.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
  *
  * See the AUTHORS file(s) distributed with this work for additional
- * information regarding authorship. 
+ * 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
@@ -18,16 +18,27 @@
 import java.net.URL;
 import java.util.Optional;
 
-import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
-
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
+import io.openmanufacturing.sds.test.MetaModelVersions;
 
-public class ClassPathMetaModelUrnResolverTest {
+public class ClassPathMetaModelUrnResolverTest extends MetaModelVersions {
    @Test
    public void testUrlConstruction() {
       for ( final KnownVersion version : KnownVersion.getVersions() ) {
          final Optional<URL> url = MetaModelUrls.url( "meta-model", version, "aspect-meta-model-definitions.ttl" );
          assertThat( url ).isNotEmpty();
       }
    }
+
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testContainsEntityDefinitions( final KnownVersion metaModelVersion ) {
+      assertThat( MetaModelUrls.url( "entity", metaModelVersion, "Point3d.ttl" ) ).isNotEmpty();
+      assertThat( MetaModelUrls.url( "entity", metaModelVersion, "FileResource.ttl" ) ).isNotEmpty();
+      assertThat( MetaModelUrls.url( "entity", metaModelVersion, "TimeSeriesEntity.ttl" ) ).isNotEmpty();
+   }
 }