Update tests

Author: Yauhenikapl

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/Instantiator.java

@@ -119,7 +119,7 @@ private Statement getDataType( final Resource resource ) {
             .orElseGet( () -> {
                final Statement dataType = resource.getProperty( SammNs.SAMM.dataType() );
                if ( dataType == null ) {
-                  throw new IllegalStateException(
+                  throw new AspectLoadingException(
                         String.format( "No datatype is defined on the Characteristic instance '%s: '.", resource.getLocalName() ) );
                }
                return dataType;

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoaderTest.java

@@ -28,14 +28,15 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.eclipse.esmf.aspectmodel.resolver.AspectModelResolverTest;
+import org.eclipse.esmf.aspectmodel.AspectLoadingException;
 import org.eclipse.esmf.aspectmodel.resolver.FileSystemStrategy;
 import org.eclipse.esmf.aspectmodel.resolver.ResolutionStrategy;
 import org.eclipse.esmf.metamodel.AbstractEntity;
 import org.eclipse.esmf.metamodel.AspectModel;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.HasDescription;
 import org.eclipse.esmf.samm.KnownVersion;
+import org.eclipse.esmf.test.InvalidTestAspect;
 import org.eclipse.esmf.test.TestAspect;
 import org.eclipse.esmf.test.TestResources;
 
@@ -45,9 +46,8 @@ class AspectModelLoaderTest {
 
    @Test
    void loadAspectModelWithoutCharacteristicDatatype() {
-      assertThatThrownBy( () -> new AspectModelLoader().load( AspectModelResolverTest.class.getResourceAsStream(
-            String.format( "/%s/invalid_characteristic_datatype.ttl", KnownVersion.SAMM_2_1_0.toString().toLowerCase() ) ) ) )
-            .isInstanceOf( IllegalStateException.class )
+      assertThatThrownBy( () -> TestResources.load( InvalidTestAspect.INVALID_CHARACTERISTIC_DATATYPE ) )
+            .isInstanceOf( AspectLoadingException.class )
             .hasMessage( "No datatype is defined on the Characteristic instance 'Characteristic1: '." );
    }
 

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/test/TestResources.java

@@ -33,4 +33,14 @@ public static AspectModel load( final TestAspect model ) {
             "valid/" + metaModelVersion.toString().toLowerCase() );
       return new AspectModelLoader( testModelsResolutionStrategy ).load( inputStream, Optional.of( URI.create( "testmodel:" + path ) ) );
    }
+
+   public static AspectModel load( final InvalidTestAspect model ) {
+      final KnownVersion metaModelVersion = KnownVersion.getLatest();
+      final String path = String.format( "invalid/%s/%s/%s.ttl", model.getUrn().getNamespaceMainPart(), model.getUrn().getVersion(),
+            model.getName() );
+      final InputStream inputStream = TestResources.class.getClassLoader().getResourceAsStream( path );
+      final ResolutionStrategy testModelsResolutionStrategy = new ClasspathStrategy(
+            "invalid/" + metaModelVersion.toString().toLowerCase() );
+      return new AspectModelLoader( testModelsResolutionStrategy ).load( inputStream, Optional.of( URI.create( "testmodel:" + path ) ) );
+   }
 }

core/esmf-test-aspect-models/src/main/java/org/eclipse/esmf/test/InvalidTestAspect.java

@@ -26,6 +26,7 @@ public enum InvalidTestAspect implements TestModel {
    MISSING_ASPECT_DECLARATION,
    INVALID_EXAMPLE_VALUE_DATATYPE,
    INVALID_PREFERRED_NAME_DATATYPE,
+   INVALID_CHARACTERISTIC_DATATYPE,
    RANGE_CONSTRAINT_WITH_WRONG_TYPE,
    MODEL_WITH_CYCLES;