Additional null checks and comments

[aai/babel.git] / src / test / java / org / onap / aai / babel / util / ArtifactTestUtils.java

diff --git a/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java b/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
index 445dd84..a98b7c2 100644 (file)
--- a/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
+++ b/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.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.
@@ -44,7 +44,6 @@ import org.apache.commons.io.IOUtils;
 import org.custommonkey.xmlunit.Diff;
 import org.onap.aai.babel.parser.ArtifactGeneratorToscaParser;
 import org.onap.aai.babel.xml.generator.data.Artifact;
-import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
 import org.xml.sax.SAXException;
 
 /**
@@ -52,29 +51,26 @@ import org.xml.sax.SAXException;
  */
 public class ArtifactTestUtils {
 
+    public static final String CSAR_INPUTS_FOLDER = "compressedArtifacts/";
     private static final String JSON_REQUESTS_FOLDER = "jsonFiles/";
     private static final String JSON_RESPONSES_FOLDER = "response/";
-    private static final String CSAR_INPUTS_FOLDER = "compressedArtifacts/";
 
     /**
-     * Initialise System Properties for test configuration files.
+     * Initialize System Properties for test configuration files.
      */
     public void setGeneratorSystemProperties() {
-        System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
-                getResourcePath(Resources.ARTIFACT_GENERATOR_CONFIG));
-
-        System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_GROUP_FILTERS_CONFIG_FILE,
-                getResourcePath(Resources.FILTER_TYPES_CONFIG));
+        System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE,
+                getResourcePath(Resources.TOSCA_MAPPING_CONFIG));
     }
 
     /**
-     * Load the Widget to UUID mappings from the Artifact Generator Properties (resource).
+     * Load the Widget type mappings (resource).
      * 
      * @throws IOException
-     *             if the properties file is not loaded
+     *             if the configuration file is not loaded
      */
-    public void loadWidgetToUuidMappings() throws IOException {
-        WidgetConfigurationUtil.setConfig(getResourceAsProperties(Resources.ARTIFACT_GENERATOR_CONFIG));
+    public void loadWidgetMappings() throws IOException {
+        ArtifactGeneratorToscaParser.initToscaMappingsConfiguration(getResourcePath(Resources.TOSCA_MAPPING_CONFIG));
     }
 
     /**
@@ -131,7 +127,11 @@ public class ArtifactTestUtils {
     }
 
     public String loadResourceAsString(String resourceName) throws IOException {
+        try {
         return IOUtils.toString(getResource(resourceName), Charset.defaultCharset());
+        } catch (NullPointerException e) {
+            throw new IllegalArgumentException("No such resource " + resourceName);
+        }
     }
 
     public String getRequestJson(String resource) throws IOException {