Implement requirement r02454

Change-Id: Icac494bda73069fb5435600e7d5144c584a692b6
Issue-ID: VNFSDK-175
Signed-off-by: Victor Gao <victor.gao@huawei.com>

2 files changed, 19 insertions, 0 deletions

diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
index 5693ba6..f9a8d8a 100644
--- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
+++ b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
@@ -58,6 +58,12 @@ public class CsarValidatorTest {
 
     String packageId2 = UUID.randomUUID().toString();
 
+    private String cf = classLoader.getResource("testR02454.csar").getFile();
+
+    String sample = System.getProperty("file.separator") + cf.substring(1);
+
+    String pkgid = UUID.randomUUID().toString();
+
     private String csarFile3 = classLoader.getResource("vIMS_NS.csar").getFile();
 
     String sample3 = System.getProperty("file.separator") + csarFile3.substring(1);
@@ -127,17 +133,25 @@ public class CsarValidatorTest {
         testValidateCsarIntegrity(csarValidator5);
         testValidateToscaMeta(csarValidator5);
         testValidateMainService(csarValidator5);
+
+        CsarValidator csarValidator6 = new CsarValidator(pkgid, sample);
+        testValidateCsarIntegrity(csarValidator6);
+        testValidateToscaMeta(csarValidator6);
+        testValidateMainService(csarValidator6);
+        testR02454(csarValidator6);
         // Rel1 specific test case
         String sample1Dir = sample1.replace(".csar", "");
         String sample2Dir = sample2.replace(".csar", "");
         String sample3Dir = sample3.replace(".csar", "");
         String sample4Dir = sample4.replace(".csar", "");
         String sample5Dir = sample5.replace(".csar", "");
+        String sampleDir = sample.replace(".csar", "");
         boolean result = FileUtil.deleteDirectory(sample1Dir);
         boolean result1 = FileUtil.deleteDirectory(sample2Dir);
         boolean result2 = FileUtil.deleteDirectory(sample3Dir);
         boolean result3 = FileUtil.deleteDirectory(sample4Dir);
         boolean result4 = FileUtil.deleteDirectory(sample5Dir);
+        boolean result5 = FileUtil.deleteDirectory(sampleDir);
         assertEquals(true, result == true && result1 == true && result2 == true && result3 == true && result4 == true);
     }
 
@@ -200,4 +214,9 @@ public class CsarValidatorTest {
         String result = CsarValidator.validateCsar();
         assertEquals(true, result == CommonConstants.SUCCESS_STR);
     }
+
+    private void testR02454(CsarValidator cv) {
+        String result = CsarValidator.r02454();
+        assertEquals(true, result == CommonConstants.SUCCESS_STR);
+    }
 }
diff --git a/csarvalidation/src/test/resources/testR02454.csar b/csarvalidation/src/test/resources/testR02454.csar
new file mode 100644
index 0000000..2cf70eb
--- /dev/null
+++ b/csarvalidation/src/test/resources/testR02454.csar