X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fservice%2FCsarToXmlConverterTest.java;h=4921490dbe17b472e3f210f3e0c698654a98c71d;hb=fc779f51a624bfddc68328bf3fd3c74594ef31f6;hp=8d1041238d57618299a687f0ca73bf976642ec77;hpb=a2fefc003db961b717a1809b6f63c4d5ae140baa;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 8d10412..4921490 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-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.
@@ -47,15 +47,13 @@ import org.onap.aai.babel.service.data.BabelArtifact;
 import org.onap.aai.babel.testdata.CsarTest;
 import org.onap.aai.babel.util.ArtifactTestUtils;
 import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
+import org.xml.sax.SAXException;
 
 /**
  * Tests {@link CsarToXmlConverter}.
  */
 public class CsarToXmlConverterTest {
 
-    private static final String ARTIFACT_GENERATOR_CONFIG = "artifact-generator.properties";
-    private static final String FILTER_TYPES_CONFIG = "filter-types.properties";
-
     private static final String INCORRECT_CSAR_NAME = "the_name_of_the_csar_file.csar";
     private static final String SERVICE_VERSION = "1.0";
 
@@ -73,12 +71,7 @@ public class CsarToXmlConverterTest {
 
     @Before
     public void setup() {
-        System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
-                new ArtifactTestUtils().getResourcePath(ARTIFACT_GENERATOR_CONFIG));
-
-        System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_GROUP_FILTERS_CONFIG_FILE,
-                new ArtifactTestUtils().getResourcePath(FILTER_TYPES_CONFIG));
-
+        new ArtifactTestUtils().setGeneratorSystemProperties();
         converter = new CsarToXmlConverter();
     }
 
@@ -116,11 +109,10 @@ public class CsarToXmlConverterTest {
     /**
      * Test that an Exception is thrown when the Artifact Generator properties are not present.
      *
-     * @throws CsarConverterException if there is an error either extracting the YAML files or generating XML artifacts
-     * @throws IOException if an I/O exception occurs loading the test CSAR file
-     * @throws IOException
-     * @throws XmlArtifactGenerationException
      * @throws CsarConverterException
+     *             if there is an error either extracting the YAML files or generating XML artifacts
+     * @throws IOException
+     *             if an I/O exception occurs loading the test CSAR file
      */
     @Test
     public void testArtifactGeneratorConfigMissing() throws CsarConverterException, IOException {
@@ -134,20 +126,21 @@ 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 IOException
-     * @throws XmlArtifactGenerationException
      * @throws CsarConverterException
+     *             if there is an error either extracting the YAML files or generating XML artifacts
+     * @throws IOException
+     *             if an I/O exception occurs
      */
     @Test
-    public void generateXmlFromCsarFilterTypesSystemPropertyNotSet()
-            throws IOException, XmlArtifactGenerationException, CsarConverterException {
-        exception.expect(CsarConverterException.class);
-        exception.expectMessage("Cannot generate artifacts. System property groupfilter.config not configured");
+    public void generateXmlFromCsarMappingSystemPropertyNotSet() throws CsarConverterException, IOException {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("Cannot generate artifacts. System property "
+                + 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);
     }
@@ -176,7 +169,8 @@ public class CsarToXmlConverterTest {
         filesToLoad.add("AAI-TEST CR_1-resource-7.0.xml");
         filesToLoad.add("AAI-testcr_1..NetworkCollection..0-resource-1.xml");
         filesToLoad.add("AAI-ExtVL-resource-40.0.xml");
-        assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.NETWORK_COLLECTION_CSAR_FILE);
+        assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad),
+                CsarTest.NETWORK_COLLECTION_CSAR_FILE);
     }
 
     @Test
@@ -188,13 +182,34 @@ public class CsarToXmlConverterTest {
         assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.PORT_MIRROR_CSAR);
     }
 
+    @Test
+    public void generateXmlFromServiceProxyCsar()
+            throws CsarConverterException, IOException, XmlArtifactGenerationException {
+        List<String> filesToLoad = new ArrayList<>();
+        filesToLoad.add("AAI-Grouping Service for Test-service-1.0.xml");
+        filesToLoad.add("AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml");
+        filesToLoad.add("AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml");
+        assertThatGeneratedFilesMatchExpected(createExpectedXmlFiles(filesToLoad), CsarTest.SERVICE_PROXY_CSAR_FILE);
+    }
+
+    /**
+     * A Matcher for comparing generated XML Strings with expected XML content.
+     * 
+     * @param expected
+     *            the expected XML String
+     * @return a new Matcher for comparing XML Strings
+     */
     public Matcher<String> matches(final String expected) {
         return new BaseMatcher<String>() {
             protected String theExpected = expected;
 
             @Override
             public boolean matches(Object item) {
-                return new ArtifactTestUtils().compareXmlStrings((String) item, theExpected);
+                try {
+                    return new ArtifactTestUtils().compareXmlStrings((String) item, theExpected);
+                } catch (SAXException | IOException e) {
+                    throw new RuntimeException(e);
+                }
             }
 
             @Override