Throw an Exception for XML test file mismatches

[aai/babel.git] / src / test / java / org / onap / aai / babel / service / CsarToXmlConverterTest.java

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..1d39f6d 100644 (file)
--- a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
@@ -47,6 +47,7 @@ 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}.
@@ -116,8 +117,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 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
@@ -176,7 +179,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 +192,27 @@ 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);
+    }
+
     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