Update SdWanServiceTest CSAR to make it valid

[aai/babel.git] / src / test / java / org / onap / aai / babel / csar / extractor / YamlExtractorTest.java

diff --git a/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java b/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java
index b53f38d..e01a8f0 100644 (file)
--- a/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java
+++ b/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java
@@ -111,15 +111,25 @@ public class YamlExtractorTest {
         final List<Artifact> ymlFiles = extractArchive("service-SdWanServiceTest-csar.csar");
         List<String> payloads = new ArrayList<>();
         payloads.add("ymlFiles/resource-SdWanTestVsp-template.yml");
+        payloads.add("ymlFiles/resource-SdWanTestVsp-template-interface.yml");
         payloads.add("ymlFiles/resource-TunnelXconntest-template.yml");
+        payloads.add("ymlFiles/resource-TunnelXconntest-template-interface.yml");
         payloads.add("ymlFiles/service-SdWanServiceTest-template.yml");
+        payloads.add("ymlFiles/service-SdWanServiceTest-template-interface.yml");
+        payloads.add("ymlFiles/resource-Allotedresource-template.yml");
+        payloads.add("ymlFiles/resource-SdwantestvspNodesDummyServer-template.yml");
+        payloads.add("ymlFiles/nodes.yml");
+        payloads.add("ymlFiles/capabilities.yml");
         payloads.add("ymlFiles/artifacts.yml");
         payloads.add("ymlFiles/data.yml");
+        payloads.add("ymlFiles/groups.yml");
 
         new ArtifactTestUtils().performYmlAsserts(ymlFiles, payloads);
     }
 
     /**
+     * Call the extractor with the specified arguments and assert that an exception is thrown.
+     *
      * @param archive
      * @param name
      * @param version
@@ -129,19 +139,24 @@ public class YamlExtractorTest {
         try {
             new YamlExtractor().extract(archive, name, version);
             fail("An instance of InvalidArchiveException should have been thrown");
-        } catch (Exception ex) {
+        } catch (InvalidArchiveException ex) {
             assertTrue(ex instanceof InvalidArchiveException);
             assertEquals(expectedErrorMessage, ex.getLocalizedMessage());
         }
     }
 
     /**
+     * Extract Artifacts from the specified CSAR resource.
+     *
      * @param resourceName
-     * @return
+     *            the CSAR file
+     * @return the extracted artifacts
      * @throws InvalidArchiveException
      * @throws IOException
+     *             for I/O errors
      */
     private List<Artifact> extractArchive(String resourceName) throws InvalidArchiveException, IOException {
-        return new YamlExtractor().extract(new ArtifactTestUtils().getCompressedArtifact(resourceName), resourceName, "v1");
+        byte[] csar = new ArtifactTestUtils().getCompressedArtifact(resourceName);
+        return new YamlExtractor().extract(csar, resourceName, "v1");
     }
 }