X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fxml%2Fgenerator%2Fmodel%2FTestModel.java;h=f2b78a1b2d0e34e0e03409161f6381c33e22ee87;hb=5a6fd49a6aca3a567464527335b107746e28f3bd;hp=3d5e84141fc234a6cf17bd735e72ddc9e7b80017;hpb=1954294aed95c2db4eb2659dcef91248535de079;p=aai%2Fbabel.git

diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
index 3d5e841..f2b78a1 100644
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestModel.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2019 European Software Marketing Ltd.
+ * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017-2019 European Software Marketing Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +26,11 @@ import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.aai.babel.parser.ArtifactGeneratorToscaParser;
 import org.onap.aai.babel.util.ArtifactTestUtils;
 import org.onap.aai.babel.xml.generator.model.Widget.Type;
-import org.onap.aai.babel.xml.generator.types.ModelType;
 
 /**
  * Direct tests of the Model abstract class (to improve code coverage). Not all methods are tested here. Some are
@@ -43,37 +38,32 @@ import org.onap.aai.babel.xml.generator.types.ModelType;
  */
 public class TestModel {
 
-    private Service serviceModel = new Service();
-    private List<Resource> resourceModels =
-            Arrays.asList(new Resource(Type.CR, true), new Resource(Type.INSTANCE_GROUP, true));
-    private Widget widgetModel = new OamNetwork();
+    private Widget widgetModel = new Widget(Type.OAM_NETWORK, "oam-network", true);
     private Model anonymousModel;
 
-    static {
-        System.setProperty("APP_HOME", ".");
-    }
-
     /**
-     * Initialise the Artifact Generator with filtering and mapping configuration. Also Load the Widget to UUID mappings
+     * Initialize the Artifact Generator with filtering and mapping configuration. Also load the Widget to UUID mappings
      * from the Artifact Generator properties.
      *
      * @throws IOException
-     *     if the Artifact Generator properties file is not loaded
+     *             if the mappings configuration cannot be loaded
      */
     @Before
     public void setup() throws IOException {
         ArtifactTestUtils utils = new ArtifactTestUtils();
         utils.setGeneratorSystemProperties();
 
-        ArtifactGeneratorToscaParser.initGroupFilterConfiguration();
+        String configLocation = System.getProperty(ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE);
+        if (configLocation == null) {
+            throw new IllegalArgumentException(
+                    String.format(ArtifactGeneratorToscaParser.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND,
+                            ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE));
+        }
+
+        ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(configLocation);
         utils.loadWidgetToUuidMappings();
 
         anonymousModel = new Model() {
-            @Override
-            public boolean addResource(Resource resource) {
-                return false;
-            }
-
             @Override
             public boolean addWidget(Widget resource) {
                 return false;
@@ -85,13 +75,8 @@ public class TestModel {
             }
 
             @Override
-            public Map<String, Object> getProperties() {
-                return Collections.emptyMap();
-            }
-
-            @Override
-            public boolean isResource() {
-                return false;
+            public String getModelTypeName() {
+                return null;
             }
         };
     }
@@ -123,9 +108,9 @@ public class TestModel {
      * Assert that the TOSCA type String is mapped to the expected Widget Type.
      * 
      * @param toscaType
-     *     the TOSCA type or prefix
+     *            the TOSCA type or prefix
      * @param widgetType
-     *     the type of Widget expected from the mappings
+     *            the type of Widget expected from the mappings
      */
     private void assertMapping(String toscaType, Type widgetType) {
         assertThat(Model.getModelFor(toscaType).getWidgetType(), is(widgetType));
@@ -135,26 +120,16 @@ public class TestModel {
      * Assert that the TOSCA metadata type is mapped to the expected Widget Type.
      * 
      * @param toscaType
-     *     the name (or name prefix) of the TOSCA type
+     *            the name (or name prefix) of the TOSCA type
      * @param metadataType
-     *     the type specified in the TOSCA metadata
+     *            the type specified in the TOSCA metadata
      * @param widgetType
-     *     the type of Widget expected from the mappings
+     *            the type of Widget expected from the mappings
      */
     private void assertMapping(String toscaType, String metadataType, Type widgetType) {
         assertThat(Model.getModelFor(toscaType, metadataType).getWidgetType(), is(widgetType));
     }
 
-    @Test
-    public void testGetModelType() {
-        assertThat(serviceModel.getModelType(), is(ModelType.SERVICE));
-        for (Resource resourceModel : resourceModels) {
-            assertThat(resourceModel.getModelType(), is(ModelType.RESOURCE));
-        }
-        assertThat(widgetModel.getModelType(), is(ModelType.WIDGET));
-        assertThat(anonymousModel.getModelType(), is(nullValue()));
-    }
-
     @Test
     public void testGetModelNameVersionId() {
         assertThat(anonymousModel.getModelNameVersionId(), is(nullValue()));
@@ -163,9 +138,6 @@ public class TestModel {
     @Test(expected = org.onap.aai.babel.xml.generator.error.IllegalAccessException.class)
     public void testGetModelNameVersionIdIsUnsupported() {
         assertThat(widgetModel.getModelNameVersionId(), is(nullValue()));
-        assertThat(resourceModels.get(0).getModelType(), is(ModelType.RESOURCE));
-        assertThat(widgetModel.getModelType(), is(ModelType.WIDGET));
-        assertThat(anonymousModel.getModelType(), is(nullValue()));
     }
 
 }