Merge "Non_mano_artifact"

2 files changed, 9 insertions, 7 deletions

diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java
index ca85c7a..810ef0f 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java
@@ -26,6 +26,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class PnfCSARArchiveTest {
 
+    public static final String SOURCE_TAG = "Source";
+
     @Test
     public void shouldUseDataStoredInManifestMfFileToConfigurePnfCSARArchive() throws Exception {
         // given
@@ -61,16 +63,16 @@ public class PnfCSARArchiveTest {
 
     private void verifyThatNonManoArtifactsWereSet(PnfCSARArchive.PnfManifest manifest) {
         Map<String, Map<String, List<String>>> nonManoArtifacts = manifest.getNonMano();
-        assertThat(nonManoArtifacts.get("onap_ves_events").get("source"))
+        assertThat(nonManoArtifacts.get("onap_ves_events").get(SOURCE_TAG))
                 .isEqualTo(Lists.newArrayList("Artifacts/Events/VES_registration.yml")
                 );
-        assertThat(nonManoArtifacts.get("onap_pm_dictionary").get("source"))
+        assertThat(nonManoArtifacts.get("onap_pm_dictionary").get(SOURCE_TAG))
                 .isEqualTo(Lists.newArrayList("Artifacts/Measurements/PM_Dictionary.yaml")
                 );
-        assertThat(nonManoArtifacts.get("onap_yang_module").get("source"))
+        assertThat(nonManoArtifacts.get("onap_yang_modules").get(SOURCE_TAG))
                 .isEqualTo(Lists.newArrayList("Artifacts/Yang_module/Yang_module.yaml")
                 );
-        assertThat(nonManoArtifacts.get("onap_others").get("source"))
+        assertThat(nonManoArtifacts.get("onap_others").get(SOURCE_TAG))
                 .isEqualTo(Lists.newArrayList(
                         "Artifacts/scripts/install.sh",
                         "Artifacts/Informational/user_guide.txt",
diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092IntegrationTest.java
index ba51882..0e0f35d 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092IntegrationTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092IntegrationTest.java
@@ -69,7 +69,7 @@ public class VTPValidateCSARR146092IntegrationTest {
         assertThat(convertToMessagesList(errors)).contains(
                 "Missing. Entry [onap_ves_events]",
                 "Missing. Entry [onap_pm_dictionary]",
-                "Missing. Entry [onap_yang_module]",
+                "Missing. Entry [onap_yang_modules]",
                 "Missing. Entry [onap_others]"
         );
     }
@@ -87,7 +87,7 @@ public class VTPValidateCSARR146092IntegrationTest {
         List<CSARArchive.CSARError> errors = testCase.getErrors();
         assertThat(errors.size()).isEqualTo(1);
         assertThat(convertToMessagesList(errors)).contains(
-                "Missing. Entry [source under onap_ves_events]"
+                "Missing. Entry [Source under onap_ves_events]"
         );
     }
 
@@ -104,7 +104,7 @@ public class VTPValidateCSARR146092IntegrationTest {
         List<CSARArchive.CSARError> errors = testCase.getErrors();
         assertThat(errors.size()).isEqualTo(1);
         assertThat(convertToMessagesList(errors)).contains(
-                "Invalid. Entry [source under onap_ves_events has invalid 'Artifacts/Deployment/Events/RadioNode.yml' path]"
+                "Invalid. Entry [Source under onap_ves_events has invalid 'Artifacts/Deployment/Events/RadioNode.yml' path]"
         );
     }