X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Fservice%2FCsarToXmlConverterTest.java;h=62e926536b5a57c379b65426292d6e534deaac96;hb=80a8e4b685a16ef58603fc487d7c0c2adf427b02;hp=0d6c7b3bb18f4897baa2182d96e997f6c16d30e9;hpb=dc94e09008ba0eb9dce7541d2c898ddc5c500814;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 0d6c7b3..62e9265 100644
--- a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
@@ -58,7 +58,15 @@ public class CsarToXmlConverterTest {
     }
 
     private enum CsarTest {
-        VALID_CSAR_FILE("service-SdWanServiceTest-csar.csar"), NO_YAML_FILES("noYmlFilesArchive.zip");
+        VALID_CSAR_FILE(
+                "service-SdWanServiceTest-csar.csar"
+        ),
+        NO_YAML_FILES(
+                "noYmlFilesArchive.zip"
+        ),
+        PORT_MIRROR_CSAR(
+                "service_PortMirror.csar"
+        );
 
         private String filename;
         private ArtifactTestUtils artifactTestUtils = new ArtifactTestUtils();
@@ -95,27 +103,27 @@ public class CsarToXmlConverterTest {
     }
 
     @Test(expected = NullPointerException.class)
-    public void generateXmlFromCsar_nullArtifactSupplied() throws CsarConverterException {
+    public void testNullArtifactSupplied() throws CsarConverterException {
         converter.generateXmlFromCsar(null, null, null);
     }
 
     @Test(expected = NullPointerException.class)
-    public void generateXmlFromCsar_missingName() throws CsarConverterException, IOException {
+    public void testMissingName() throws CsarConverterException, IOException {
         converter.generateXmlFromCsar(CsarTest.VALID_CSAR_FILE.getContent(), null, null);
     }
 
     @Test(expected = NullPointerException.class)
-    public void generateXmlFromCsar_missingVersion() throws CsarConverterException, IOException {
+    public void testMissingVersion() throws CsarConverterException, IOException {
         converter.generateXmlFromCsar(CsarTest.VALID_CSAR_FILE.getContent(), INCORRECT_CSAR_NAME, null);
     }
 
     @Test(expected = CsarConverterException.class)
-    public void generateXmlFromCsar_noPayloadExists() throws CsarConverterException {
+    public void testNoPayloadExists() throws CsarConverterException {
         converter.generateXmlFromCsar(new byte[0], INCORRECT_CSAR_NAME, SERVICE_VERSION);
     }
 
     @Test(expected = CsarConverterException.class)
-    public void generateXmlFromCsar_csarFileHasNoYmlFiles() throws CsarConverterException, IOException {
+    public void testCsarFileHasNoYmlFiles() throws CsarConverterException, IOException {
         converter.generateXmlFromCsar(CsarTest.NO_YAML_FILES.getContent(), "noYmlFilesArchive.zip", SERVICE_VERSION);
     }
 
@@ -142,6 +150,18 @@ public class CsarToXmlConverterTest {
                         ga.getPayload(), matches(expectedXmlFiles.get(ga.getName()))));
     }
 
+    @Test
+    public void generatePortMirrorConfigurationModel()
+            throws CsarConverterException, IOException, XmlArtifactGenerationException {
+        Map<String, String> expectedXmlFiles = createExpectedXmlFiles();
+        List<BabelArtifact> generatedArtifacts = converter.generateXmlFromCsar(CsarTest.PORT_MIRROR_CSAR.getContent(),
+                CsarTest.PORT_MIRROR_CSAR.getName(), SERVICE_VERSION);
+
+        generatedArtifacts
+                .forEach(ga -> assertThat("The content of " + ga.getName() + " must match the expected content",
+                        ga.getPayload(), matches(expectedXmlFiles.get(ga.getName()))));
+    }
+
     public Matcher<String> matches(final String expected) {
         return new BaseMatcher<String>() {
             protected String theExpected = expected;
@@ -166,6 +186,8 @@ public class CsarToXmlConverterTest {
         filesToLoad.add("AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml");
         filesToLoad.add("AAI-Tunnel_XConnTest-resource-2.0.xml");
         filesToLoad.add("AAI-SD-WAN-Test-VSP-resource-1.0.xml");
+        filesToLoad.add("AAI-Port Mirror_Test-service-1.0.xml");
+        filesToLoad.add("AAI-Port Mirroring Configuration-resource-35.0.xml");
 
         for (String filename : filesToLoad) {
             xmlMap.put(filename, new ArtifactTestUtils().loadResourceAsString("generatedXml/" + filename));