X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fservice%2FCsarToXmlConverterTest.java;h=5001a094f0ef5ac217bc38583a4552ff706c29bb;hb=ff0718120f36e14b065047f0b3f29665f2191e53;hp=bcd1e8a33ec46f0d00c17e102f13b2d59625ba09;hpb=a583d474260f071cb2ee465ec76a277240575a21;p=aai%2Fbabel.git

diff --git a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
index bcd1e8a..5001a09 100644
--- a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.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.
@@ -57,12 +57,6 @@ public class CsarToXmlConverterTest {
     private static final String INCORRECT_CSAR_NAME = "the_name_of_the_csar_file.csar";
     private static final String SERVICE_VERSION = "1.0";
 
-    static {
-        if (System.getProperty("APP_HOME") == null) {
-            System.setProperty("APP_HOME", ".");
-        }
-    }
-
     // The class to be tested.
     private CsarToXmlConverter converter;
 
@@ -116,8 +110,9 @@ public class CsarToXmlConverterTest {
      */
     @Test
     public void testArtifactGeneratorConfigMissing() throws CsarConverterException, IOException {
-        exception.expect(CsarConverterException.class);
-        exception.expectMessage("Cannot generate artifacts. System property artifactgenerator.config not configured");
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("Cannot generate artifacts. System property "
+                + ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE + " not configured");
 
         // Unset the required system property
         System.clearProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE);
@@ -126,7 +121,7 @@ public class CsarToXmlConverterTest {
     }
 
     /**
-     * Test that an Exception is thrown when the Artifact Generator's Group Filter properties are not present.
+     * Test that an Exception is thrown when the Artifact Generator's TOSCA Mappings configuration file is not present.
      *
      * @throws CsarConverterException
      *             if there is an error either extracting the YAML files or generating XML artifacts
@@ -134,13 +129,13 @@ public class CsarToXmlConverterTest {
      *             if an I/O exception occurs
      */
     @Test
-    public void generateXmlFromCsarFilterTypesSystemPropertyNotSet() throws CsarConverterException, IOException {
-        exception.expect(CsarConverterException.class);
+    public void generateXmlFromCsarMappingSystemPropertyNotSet() throws CsarConverterException, IOException {
+        exception.expect(IllegalArgumentException.class);
         exception.expectMessage("Cannot generate artifacts. System property "
-                + ArtifactGeneratorToscaParser.PROPERTY_GROUP_FILTERS_CONFIG_FILE + " not configured");
+                + ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE + " not configured");
 
         // Unset the required system property
-        System.clearProperty(ArtifactGeneratorToscaParser.PROPERTY_GROUP_FILTERS_CONFIG_FILE);
+        System.clearProperty(ArtifactGeneratorToscaParser.PROPERTY_TOSCA_MAPPING_FILE);
         converter.generateXmlFromCsar(CsarTest.SD_WAN_CSAR_FILE.getContent(), CsarTest.SD_WAN_CSAR_FILE.getName(),
                 SERVICE_VERSION);
     }