Load type mappings from a group configuration file

[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 9b5700d..912a505 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
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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,15 +26,13 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
+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;
 
@@ -54,20 +52,19 @@ public class TestModel {
     }
 
     /**
-     * Load the Widget to UUID mappings from the Artifact Generator properties.
+     * Initialise the Artifact Generator with filtering and mapping configuration. Also Load the Widget to UUID mappings
+     * from the Artifact Generator properties.
      *
-     * @throws FileNotFoundException
-     *             if the properties file is missing
      * @throws IOException
-     *             if the properties file is not loaded
+     *             if the Artifact Generator properties file is not loaded
      */
     @Before
-    public void setup() throws FileNotFoundException, IOException {
-        InputStream in = TestModel.class.getClassLoader().getResourceAsStream("artifact-generator.properties");
-        Properties properties = new Properties();
-        properties.load(in);
-        in.close();
-        WidgetConfigurationUtil.setConfig(properties);
+    public void setup() throws IOException {
+        ArtifactTestUtils utils = new ArtifactTestUtils();
+        utils.setGeneratorSystemProperties();
+
+        ArtifactGeneratorToscaParser.initGroupFilterConfiguration();
+        utils.loadWidgetToUuidMappings();
 
         anonymousModel = new Model() {
             @Override