Move Widget attribute data to the mappings JSON

[aai/babel.git] / src / test / java / org / onap / aai / babel / xml / generator / model / TestModel.java

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..4c5ff20 100644 (file)
--- 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
@@ -46,7 +46,7 @@ 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 {
@@ -54,18 +54,25 @@ public class TestModel {
     }
 
     /**
-     * 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 Artifact Generator properties file is not 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() {
@@ -123,9 +130,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,11 +142,11 @@ 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));