Add validation for asd descriptor and invariant id

[nonrtric/plt/rappmanager.git] / rapp-manager-models / src / test / java / com / oransc / rappmanager / models / csar / validator / ArtifactDefinitionValidatorTest.java

diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java
index 7348116..b0c2f43 100755 (executable)
--- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java
+++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java
@@ -83,33 +83,11 @@ class ArtifactDefinitionValidatorTest {
         assertTrue(exception.getMessage().startsWith("rApp package missing a file"));
     }
 
-    @Test
-    void testCsarNoAsdFailure() {
-        MultipartFile multipartFile = mock(MultipartFile.class);
-        RappValidationException exception = assertThrows(RappValidationException.class,
-                () -> artifactDefinitionValidator.validate(multipartFile, null));
-        assertEquals(HttpStatus.BAD_REQUEST, exception.getStatusCode());
-        assertEquals("ASD definition in rApp package is invalid.", exception.getMessage());
-    }
 
-    @ParameterizedTest
-    @NullSource
-    @ValueSource(strings = {""})
-    void testCsarAsdLocationNullFailure(String asdLocation) throws IOException {
-        String rappCsarPath = validCsarFileLocation + File.separator + invalidRappAsdEmptyFile;
-        MultipartFile multipartFile =
-                new MockMultipartFile(rappCsarPath, rappCsarPath, ContentType.MULTIPART_FORM_DATA.getMimeType(),
-                        new FileInputStream(rappCsarPath));
-        doReturn(asdLocation).when(rappValidationUtils).getAsdDefinitionLocation(any());
-        RappValidationException exception = assertThrows(RappValidationException.class,
-                () -> artifactDefinitionValidator.validate(multipartFile, null));
-        assertEquals(HttpStatus.BAD_REQUEST, exception.getStatusCode());
-        assertEquals("ASD definition in rApp package is invalid.", exception.getMessage());
-    }
 
     @ParameterizedTest
     @NullSource
-    @ValueSource(strings = {"", "{asasdasd"})
+    @ValueSource(strings = {"{asasdasd"})
     void testCsarAsdContentInvalidFailure(String asdContent) throws IOException {
         String rappCsarPath = validCsarFileLocation + File.separator + validRappFile;
         MultipartFile multipartFile =