From fb8f400b302b3a38be1f552ca19ee8174f527f16 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Mon, 11 Mar 2024 17:08:12 +0000 Subject: [PATCH] Update invalid package test with additional packages Invalid rApp package test added with additional CSAR packages. Issue-ID: NONRTRIC-990 Change-Id: Ia5cd33ee4b5e9d784881f7879aff5c62b0d68a8a Signed-off-by: aravind.est --- .../com/oransc/rappmanager/rest/RappControllerTest.java | 14 ++++++++------ .../generatetestrapppackages.go | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java index 6e7566d..1a5369b 100755 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java +++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java @@ -42,6 +42,7 @@ import org.apache.http.entity.ContentType; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; @@ -71,8 +72,6 @@ class RappControllerTest { SmeLifecycleManager smeLifecycleManager; private final String validRappFile = "valid-rapp-package.csar"; - - private final String invalidRappFile = "invalid-rapp-package.csar"; private final String validCsarFileLocation = "src/test/resources/"; private final ObjectMapper objectMapper = new ObjectMapper(); @@ -126,11 +125,14 @@ class RappControllerTest { .andExpect(status().isAccepted()); } - @Test - void testCreateInvalidRapp() throws Exception { - String rappCsarPath = validCsarFileLocation + File.separator + invalidRappFile; + @ParameterizedTest + @ValueSource(strings = {"invalid-rapp-package.csar", "invalid-rapp-package-no-asd-yaml.csar", + "invalid-rapp-package-empty-asd-yaml.csar", "invalid-rapp-package-no-tosca.csar", + "invalid-rapp-package-no-acm-composition.csar", "invalid-rapp-package-missing-artifact.csar"}) + void testCreateInvalidRapp(String rAppPackageName) throws Exception { + String rappCsarPath = validCsarFileLocation + File.separator + rAppPackageName; MockMultipartFile multipartFile = - new MockMultipartFile("file", invalidRappFile, ContentType.MULTIPART_FORM_DATA.getMimeType(), + new MockMultipartFile("file", rAppPackageName, ContentType.MULTIPART_FORM_DATA.getMimeType(), new FileInputStream(rappCsarPath)); mockMvc.perform(MockMvcRequestBuilders.multipart("/rapps/{rapp_id}", UUID.randomUUID()).file(multipartFile)) .andExpect(status().isBadRequest()); diff --git a/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go b/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go index 8d39e68..462a4c2 100755 --- a/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go +++ b/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go @@ -206,31 +206,31 @@ func main() { INVALID_RAPP_PACKAGE_NO_TOSCA_FOLDER_NAME := "invalid-rapp-package-no-tosca" cp.Copy(RAPP_BASE_PACKAGE, INVALID_RAPP_PACKAGE_NO_TOSCA_FOLDER_NAME) os.Remove(INVALID_RAPP_PACKAGE_NO_TOSCA_FOLDER_NAME + "/TOSCA-Metadata/TOSCA.meta") - createCsarAndCopy(INVALID_RAPP_PACKAGE_NO_TOSCA_FOLDER_NAME, MODELS_TEST_RESOURCES) + createCsarAndCopy(INVALID_RAPP_PACKAGE_NO_TOSCA_FOLDER_NAME, MODELS_TEST_RESOURCES, APPLICATION_TEST_RESOURCES) fmt.Println("Generating invalid rApp package without asd yaml...") INVALID_RAPP_PACKAGE_NO_ASD_YAML_FOLDER_NAME := "invalid-rapp-package-no-asd-yaml" cp.Copy(RAPP_BASE_PACKAGE, INVALID_RAPP_PACKAGE_NO_ASD_YAML_FOLDER_NAME) os.Remove(INVALID_RAPP_PACKAGE_NO_ASD_YAML_FOLDER_NAME + "/Definitions/asd.yaml") - createCsarAndCopy(INVALID_RAPP_PACKAGE_NO_ASD_YAML_FOLDER_NAME, MODELS_TEST_RESOURCES) + createCsarAndCopy(INVALID_RAPP_PACKAGE_NO_ASD_YAML_FOLDER_NAME, MODELS_TEST_RESOURCES, APPLICATION_TEST_RESOURCES) fmt.Println("Generating invalid rApp package without ACM composition...") INVALID_RAPP_PACKAGE_NO_ACM_COMPOSITION_FOLDER_NAME := "invalid-rapp-package-no-acm-composition" cp.Copy(RAPP_BASE_PACKAGE, INVALID_RAPP_PACKAGE_NO_ACM_COMPOSITION_FOLDER_NAME) os.Remove(INVALID_RAPP_PACKAGE_NO_ACM_COMPOSITION_FOLDER_NAME + "/Files/Acm/definition/compositions.json") - createCsarAndCopy(INVALID_RAPP_PACKAGE_NO_ACM_COMPOSITION_FOLDER_NAME, MODELS_TEST_RESOURCES) + createCsarAndCopy(INVALID_RAPP_PACKAGE_NO_ACM_COMPOSITION_FOLDER_NAME, MODELS_TEST_RESOURCES, APPLICATION_TEST_RESOURCES) fmt.Println("Generating invalid rApp package without Artifacts...") INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME := "invalid-rapp-package-missing-artifact" cp.Copy(RAPP_BASE_PACKAGE, INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME) os.Remove(INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME + "/Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz") - createCsarAndCopy(INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME, MODELS_TEST_RESOURCES) + createCsarAndCopy(INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME, MODELS_TEST_RESOURCES, APPLICATION_TEST_RESOURCES) fmt.Println("Generating invalid rApp package with empty asd yaml...") INVALID_RAPP_PACKAGE_EMPTY_ASD_FOLDER_NAME := "invalid-rapp-package-empty-asd-yaml" cp.Copy(RAPP_BASE_PACKAGE, INVALID_RAPP_PACKAGE_EMPTY_ASD_FOLDER_NAME) os.Truncate(INVALID_RAPP_PACKAGE_EMPTY_ASD_FOLDER_NAME+"/Definitions/asd.yaml", 0) - createCsarAndCopy(INVALID_RAPP_PACKAGE_EMPTY_ASD_FOLDER_NAME, MODELS_TEST_RESOURCES) + createCsarAndCopy(INVALID_RAPP_PACKAGE_EMPTY_ASD_FOLDER_NAME, MODELS_TEST_RESOURCES, APPLICATION_TEST_RESOURCES) fmt.Println("Generating valid rApp package with new dme info type...") VALID_RAPP_PACKAGE_NEW_INFO_TYPE_FOLDER_NAME := "valid-rapp-package-new-info-type" -- 2.16.6