From 8ac0d45cbe411112f5267336981240b329678c1c Mon Sep 17 00:00:00 2001 From: Michal Banka Date: Wed, 13 May 2020 09:52:21 +0200 Subject: Increase code coverage of R972082 rule Change-Id: I6d8174842128ba7fa8aa1b2167c048d00edaf9fa Signed-off-by: Michal Banka Issue-ID: VNFSDK-585 --- .../VTPValidateCSARR972082IntegrationTest.java | 35 +++++++++++++++++++++ .../pnf/r972082/invalidYamlStructure.csar | Bin 0 -> 18075 bytes .../missingSourceElementUnderAttributeError.csar | Bin 0 -> 18064 bytes 3 files changed, 35 insertions(+) create mode 100644 csarvalidation/src/test/resources/pnf/r972082/invalidYamlStructure.csar create mode 100644 csarvalidation/src/test/resources/pnf/r972082/missingSourceElementUnderAttributeError.csar diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java index fb9e431..48b2d6e 100644 --- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java +++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java @@ -21,10 +21,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.onap.cvc.csar.cc.sol004.IntegrationTestUtils.configureTestCase; import static org.onap.cvc.csar.cc.sol004.IntegrationTestUtils.convertToMessagesList; +import java.net.URISyntaxException; import java.util.List; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.onap.cli.fw.error.OnapCommandException; import org.onap.cvc.csar.CSARArchive; import org.onap.cvc.csar.CSARArchive.CSARError; @@ -110,4 +112,37 @@ public class VTPValidateCSARR972082IntegrationTest { ); } + @Test + public void shouldReportMissingSourceElementUnderAttribute() throws OnapCommandException, URISyntaxException { + // given + configureTestCase(testCase, PNF_R_972082 + "missingSourceElementUnderAttributeError.csar", + VTP_VALIDATE_CSAR_R_972082_YAML, IS_PNF); + + // when + testCase.execute(); + + // then + final List errors = testCase.getErrors(); + assertThat(errors.size()).isEqualTo(1); + assertThat(convertToMessagesList(errors)).contains( + "Missing. Entry [Source under onap_pnf_sw_information]" + ); + } + + @Test + public void shouldReportInvalidYamlStructure() throws OnapCommandException, URISyntaxException { + // given + configureTestCase(testCase, PNF_R_972082 + "invalidYamlStructure.csar", + VTP_VALIDATE_CSAR_R_972082_YAML, IS_PNF); + + // when + testCase.execute(); + + // then + final List errors = testCase.getErrors(); + assertThat(errors.size()).isEqualTo(1); + assertThat(convertToMessagesList(errors)).contains( + "Invalid. Yaml file Files/pnf-sw-information/pnf-sw-information.yaml is invalid" + ); + } } \ No newline at end of file diff --git a/csarvalidation/src/test/resources/pnf/r972082/invalidYamlStructure.csar b/csarvalidation/src/test/resources/pnf/r972082/invalidYamlStructure.csar new file mode 100644 index 0000000..3360ce4 Binary files /dev/null and b/csarvalidation/src/test/resources/pnf/r972082/invalidYamlStructure.csar differ diff --git a/csarvalidation/src/test/resources/pnf/r972082/missingSourceElementUnderAttributeError.csar b/csarvalidation/src/test/resources/pnf/r972082/missingSourceElementUnderAttributeError.csar new file mode 100644 index 0000000..e11093c Binary files /dev/null and b/csarvalidation/src/test/resources/pnf/r972082/missingSourceElementUnderAttributeError.csar differ -- cgit 1.2.3-korg