2 files changed, 39 insertions, 4 deletions

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]"
         );
     }
 
diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965IntegrationTest.java
index c19fe99..ffbf87e 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965IntegrationTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965IntegrationTest.java
@@ -60,6 +60,42 @@ public class VTPValidateCSARR787965IntegrationTest {
     }
 
     @Test
+    public void shouldReportThatZipContainsSignatureWithCertificationFileAndPackageIsProbableValid() throws Exception {
+
+        // given
+        configureTestCase(testCase, "pnf/r787965/signature-and-certificate.zip");
+
+        // when
+        testCase.execute();
+
+        // then
+        List<CSARArchive.CSARError> errors = testCase.getErrors();
+        assertThat(errors.size()).isEqualTo(1);
+        assertThat(convertToMessagesList(errors)).contains(
+                "Warning. Zip package probably is valid. " +
+                        "It contains only signature with certification cms and csar package. " +
+                        "Unable to verify csar signature."
+        );
+    }
+
+    @Test
+    public void shouldReportThatZipPackageIsBroken() throws Exception {
+
+        // given
+        configureTestCase(testCase, "pnf/r787965/broken.zip");
+
+        // when
+        testCase.execute();
+
+        // then
+        List<CSARArchive.CSARError> errors = testCase.getErrors();
+        assertThat(errors.size()).isEqualTo(1);
+        assertThat(convertToMessagesList(errors)).contains(
+                "Missing. Unable to find certification files."
+        );
+    }
+
+    @Test
     public void shouldDoNotReportAnyErrorWhenPackageHasValidSignature() throws Exception {
 
         // given
@@ -73,5 +109,4 @@ public class VTPValidateCSARR787965IntegrationTest {
         assertThat(errors.size()).isEqualTo(0);
     }
 
-
 }
\ No newline at end of file