summaryrefslogtreecommitdiffstats
path: root/csarvalidation/src/test/java/org/onap
diff options
context:
space:
mode:
authorMurali-P <murali.p@huawei.com>2018-04-04 18:19:29 +0530
committerMurali-P <murali.p@huawei.com>2018-04-04 18:19:29 +0530
commitfcb4e980f76116edb2ec6a656a99d510c70c1c94 (patch)
tree114da667ffbb27ed3574cdeb32ae6ed0baa6357e /csarvalidation/src/test/java/org/onap
parent395bc63e559da4b6e201e7271ac65d12e6f5f6c5 (diff)
Enhance error messages for validation
Show proper error message in UI Change-Id: I39158f3d727cd817758fd688ec6bbf4fbd8ae426 Issue-ID: VNFSDK-233 Signed-off-by: Murali-P <murali.p@huawei.com>
Diffstat (limited to 'csarvalidation/src/test/java/org/onap')
-rw-r--r--csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java64
1 files changed, 39 insertions, 25 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 846d9af..5693ba6 100644
--- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
+++ b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
@@ -30,36 +30,52 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
+
import org.junit.Test;
+import org.onap.validation.csar.CommonConstants;
import org.onap.validation.csar.CsarValidator;
import org.onap.validation.csar.FileUtil;
public class CsarValidatorTest {
String regex = "^\\/[a-zA-Z]\\:\\/";
+
ClassLoader classLoader = getClass().getClassLoader();
+
Pattern pattern = Pattern.compile(regex);
+
private String csarFile = classLoader.getResource("enterprise2DC.csar").getFile();
+
Matcher matcher = pattern.matcher(csarFile);
+
String sample1 = System.getProperty("file.separator") + csarFile.substring(1);
+
String packageId = UUID.randomUUID().toString();
private String csarFile2 = classLoader.getResource("vEPC_NS.csar").getFile();
+
String sample2 = System.getProperty("file.separator") + csarFile2.substring(1);
+
String packageId2 = UUID.randomUUID().toString();
private String csarFile3 = classLoader.getResource("vIMS_NS.csar").getFile();
+
String sample3 = System.getProperty("file.separator") + csarFile3.substring(1);
- String packageId3 = UUID.randomUUID().toString();
-
+
+ String packageId3 = UUID.randomUUID().toString();
+
private String csarFile4 = classLoader.getResource("VoLTE.csar").getFile();
+
String sample4 = System.getProperty("file.separator") + csarFile4.substring(1);
- String packageId4 = UUID.randomUUID().toString();
-
+
+ String packageId4 = UUID.randomUUID().toString();
+
private String csarFile5 = classLoader.getResource("sample2.csar").getFile();
+
String sample5 = System.getProperty("file.separator") + csarFile5.substring(1);
- String packageId5 = UUID.randomUUID().toString();
-
+
+ String packageId5 = UUID.randomUUID().toString();
+
@Test
public void testAll() throws IOException, InterruptedException {
CsarValidator csarValidator = new CsarValidator(packageId, sample1);
@@ -96,22 +112,22 @@ public class CsarValidatorTest {
testValidateCsarIntegrity(csarValidator2);
testValidateToscaMeta(csarValidator2);
testValidateMainService(csarValidator2);
-
+
CsarValidator csarValidator3 = new CsarValidator(packageId3, sample3);
testValidateCsarIntegrity(csarValidator3);
testValidateToscaMeta(csarValidator3);
testValidateMainService(csarValidator3);
-
+
CsarValidator csarValidator4 = new CsarValidator(packageId4, sample4);
testValidateCsarIntegrity(csarValidator4);
testValidateToscaMeta(csarValidator4);
testValidateMainService(csarValidator4);
-
+
CsarValidator csarValidator5 = new CsarValidator(packageId5, sample5);
testValidateCsarIntegrity(csarValidator5);
testValidateToscaMeta(csarValidator5);
testValidateMainService(csarValidator5);
- //Rel1 specific test case
+ // Rel1 specific test case
String sample1Dir = sample1.replace(".csar", "");
String sample2Dir = sample2.replace(".csar", "");
String sample3Dir = sample3.replace(".csar", "");
@@ -124,7 +140,7 @@ public class CsarValidatorTest {
boolean result4 = FileUtil.deleteDirectory(sample5Dir);
assertEquals(true, result == true && result1 == true && result2 == true && result3 == true && result4 == true);
}
-
+
@Test
public void testCloseInputStream() {
InputStream dir = null;
@@ -139,13 +155,13 @@ public class CsarValidatorTest {
FileUtil.closeZipFile(dir1);
assertTrue(true);
}
-
+
@Test
public void testCloseFileStream() throws FileNotFoundException {
FileInputStream dir3 = new FileInputStream(sample1);
- FileUtil.closeFileStream(dir3 );
+ FileUtil.closeFileStream(dir3);
}
-
+
@Test
public void testCloseOutptutStream() {
OutputStream dir4 = new OutputStream() {
@@ -153,37 +169,35 @@ public class CsarValidatorTest {
@Override
public void write(int number) throws IOException {
- }
+ }
};
FileUtil.closeOutputStream(dir4);
}
private void testValidateCsarMeta(CsarValidator cv) {
- boolean result = CsarValidator.validateCsarMeta();
- assertEquals(true, result == true);
+ String result = CsarValidator.validateCsarMeta();
+ assertEquals(true, result == CommonConstants.SUCCESS_STR);
}
-
private void testValidateCsarIntegrity(CsarValidator cv) {
boolean result = CsarValidator.validateCsarIntegrity(sample1);
assertEquals(true, result == true);
}
-
private void testValidateToscaMeta(CsarValidator cv) {
- boolean result = CsarValidator.validateAndScanToscaMeta();
- assertEquals(true, result == true);
+ String result = CsarValidator.validateAndScanToscaMeta();
+ assertEquals(true, result == CommonConstants.SUCCESS_STR);
}
private void testValidateMainService(CsarValidator cv) {
- boolean result = CsarValidator.validateMainService();
- assertEquals(true, result == true);
+ String result = CsarValidator.validateMainService();
+ assertEquals(true, result == CommonConstants.SUCCESS_STR);
}
private void testValidateCsar(CsarValidator cv) {
- boolean result = CsarValidator.validateCsar();
- assertEquals(true, result == true);
+ String result = CsarValidator.validateCsar();
+ assertEquals(true, result == CommonConstants.SUCCESS_STR);
}
}