1 files changed, 26 insertions, 22 deletions

diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java
index 299aff2..491b20a 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java
@@ -35,79 +35,83 @@ import static org.onap.cvc.csar.cc.sol004.IntegrationTestUtils.absoluteFilePath;
 
 public class CsarValidatorTest {
 
-    private static final String NO_CERTIFICATE_RULE = "r130206";
+    private static final String CERTIFICATION_RULE = "r130206";
     private static final String OPERATION_STATUS_FAILED = "FAILED";
+    private static final String OPERATION_STATUS_PASS = "PASS";
 
     @Test
-    public void shouldReportErrorAsWarningWhenErrorIsIgnored() throws URISyntaxException {
+    public void shouldReportThanVnfValidationFailed() throws URISyntaxException {
         // given
         OnapCliWrapper cli = new OnapCliWrapper(new String[]{
             "--product", "onap-dublin",
             "csar-validate",
             "--format", "json",
-            "--pnf",
-            "--csar", absoluteFilePath("pnf/r130206/csar-option1-warning-2.csar")});
+            "--csar", absoluteFilePath("VoLTE.csar")});
 
         // when
         cli.handle();
 
         // then
         final OnapCommandResult onapCommandResult = cli.getCommandResult();
-        assertTrue(onapCommandResult.getOutput().toString().contains(
-            "\"warnings\":[{\"vnfreqNo\":\"R130206\",\"code\":\"0x1006\",\"message\":\"Warning. Consider adding package "
-                + "integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1\",\"file\":\"\",\"lineNumber\":-1}]}"));
+        verifyThatOperation(onapCommandResult, OPERATION_STATUS_FAILED);
+        verifyThatXRulesFails(onapCommandResult, 7);
+        verifyThatOperationFinishedWithoutAnyError(cli);
     }
 
+
     @Test
-    public void shouldReportThanVnfValidationFailed() throws URISyntaxException {
+    public void shouldReportOnlyWarningWhenCsarDoNotHaveCertificateAndHashesInManifest() throws URISyntaxException {
         // given
         OnapCliWrapper cli = new OnapCliWrapper(new String[]{
             "--product", "onap-dublin",
             "csar-validate",
             "--format", "json",
-            "--csar", absoluteFilePath("VoLTE.csar")});
-
+            "--pnf",
+            "--csar", absoluteFilePath("pnf/validFile.csar")});
         // when
         cli.handle();
 
         // then
         final OnapCommandResult onapCommandResult = cli.getCommandResult();
-        verifyThatOperation(onapCommandResult, OPERATION_STATUS_FAILED);
-        verifyThatXRulesFails(onapCommandResult, 7);
+        verifyThatOperation(onapCommandResult, OPERATION_STATUS_PASS);
+        assertTrue(onapCommandResult.getOutput().toString().contains(
+            "\"warnings\":[{" +
+                "\"vnfreqNo\":\"R130206\"," +
+                "\"code\":\"0x1006\"," +
+                "\"message\":\"Warning. Consider adding package integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1\"," +
+                "\"file\":\"\"," +
+                "\"lineNumber\":-1}]"));
         verifyThatOperationFinishedWithoutAnyError(cli);
     }
 
-
     @Test
-    public void shouldReportThatPnfValidationFailedWhenCsarDoNotHaveCertificate_allOtherRulesShouldPass() throws URISyntaxException {
+    public void shouldNotReportThatPnfValidationFailedWhenZipDoNotHaveCertificatesAndHashesInManifest() throws URISyntaxException {
         // given
         OnapCliWrapper cli = new OnapCliWrapper(new String[]{
             "--product", "onap-dublin",
             "csar-validate",
             "--format", "json",
             "--pnf",
-            "--csar", absoluteFilePath("pnf/r972082/validFile.csar")});
+            "--csar", absoluteFilePath("pnf/signed-package-valid-signature.zip")});
+
         // when
         cli.handle();
 
         // then
         final OnapCommandResult onapCommandResult = cli.getCommandResult();
-        verifyThatOperation(onapCommandResult, OPERATION_STATUS_FAILED);
-        verifyThatXRulesFails(onapCommandResult, 1);
-        verifyThatRuleFails(onapCommandResult, NO_CERTIFICATE_RULE);
+        verifyThatOperation(onapCommandResult, OPERATION_STATUS_PASS);
         verifyThatOperationFinishedWithoutAnyError(cli);
     }
 
     @Test
-    public void shouldReportThatPnfValidationFailedWhenZipDoNotHaveCertificate_allOtherRulesShouldPass() throws URISyntaxException {
+    public void shouldReportThatPnfValidationFailedWhenCsarContainsCertificateInCmsAndInToscaAndInRootAndHashIsIncorrect_allOtherRulesShouldPass() throws URISyntaxException {
         // given
         OnapCliWrapper cli = new OnapCliWrapper(new String[]{
             "--product", "onap-dublin",
             "csar-validate",
             "--format", "json",
             "--pnf",
-            "--csar", absoluteFilePath("pnf/signed-package-valid-signature.zip")});
-
+            "--csar", absoluteFilePath("pnf/r130206/cert-in-cms-and-root-and-tosca-incorrect-hash.csar")});
         // when
         cli.handle();
 
@@ -115,7 +119,7 @@ public class CsarValidatorTest {
         final OnapCommandResult onapCommandResult = cli.getCommandResult();
         verifyThatOperation(onapCommandResult, OPERATION_STATUS_FAILED);
         verifyThatXRulesFails(onapCommandResult, 1);
-        verifyThatRuleFails(onapCommandResult, NO_CERTIFICATE_RULE);
+        verifyThatRuleFails(onapCommandResult, CERTIFICATION_RULE);
         verifyThatOperationFinishedWithoutAnyError(cli);
     }