From 167aea9954cfe9e6528671dd37445d4fc3378a97 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Tue, 17 Sep 2019 10:24:53 +0200 Subject: Non mano artifacts Change-Id: I4d7eefc999f9cd6cb5255b764da3c5ae7e84f0af Issue-ID: VNFSDK-476 Signed-off-by: Zebek Bogumil --- .../sol004/VTPValidateCSARR130206IntegrationTest.java | 8 +++++--- .../resources/pnf/r130206/csar-option1-valid.csar | Bin 7324 -> 7530 bytes 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'csarvalidation/src/test') diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java index 90da946..036e169 100644 --- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java +++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java @@ -73,9 +73,10 @@ public class VTPValidateCSARR130206IntegrationTest { // then List errors = testCase.getErrors(); - assertThat(errors.size()).isEqualTo(1); + assertThat(errors.size()).isEqualTo(2); assertThat(convertToMessagesList(errors)).contains( - "File has invalid CMS signature!" + "File has invalid CMS signature!", + "Mismatch between contents of non-mano-artifact-sets and source files of the package" ); } @@ -90,12 +91,13 @@ public class VTPValidateCSARR130206IntegrationTest { // then List errors = testCase.getErrors(); - assertThat(errors.size()).isEqualTo(5); + assertThat(errors.size()).isEqualTo(6); assertThat(convertToMessagesList(errors)).contains( "Unable to find CMS section in manifest!", "Source 'Definitions/MainServiceTemplate.yaml' has wrong hash!", "Source 'Artifacts/Other/my_script.csh' has hash, but unable to find algorithm tag!", "Unable to calculate digest - file missing: Artifacts/NonExisting2.txt", + "Mismatch between contents of non-mano-artifact-sets and source files of the package", "File has invalid CMS signature!" ); } diff --git a/csarvalidation/src/test/resources/pnf/r130206/csar-option1-valid.csar b/csarvalidation/src/test/resources/pnf/r130206/csar-option1-valid.csar index 7cca18d..08c3605 100644 Binary files a/csarvalidation/src/test/resources/pnf/r130206/csar-option1-valid.csar and b/csarvalidation/src/test/resources/pnf/r130206/csar-option1-valid.csar differ -- cgit 1.2.3-korg