X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=rapp-manager-models%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fmodels%2Fcsar%2Fvalidator%2FArtifactDefinitionValidatorTest.java;h=b0c2f439a38e37710c2326c21b804c07a6da3e1d;hb=7e301b523d66508f8493f6873e36f0d60e8caaf4;hp=7348116cc3096ccbca6ff152ad6aa2159394d030;hpb=4526832bbc18aedfe78d4359c6b058f72c458b81;p=nonrtric%2Fplt%2Frappmanager.git

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
--- 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 =