From 56c184e1622436654d9f12b1098a8020a6323a3a Mon Sep 17 00:00:00 2001 From: AvinashS Date: Mon, 18 Sep 2017 12:55:57 +0000 Subject: Instantiate validation with path To populate csar files during object creation. Change-Id: I66b5cf8b46f98990240e9cc470eff6a8874f3de0 IssueId: VNFSDK-90 Signed-off-by: AvinashS --- .../org/onap/validation/csarvalidationtest/CsarParserTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'csarvalidation/src/test/java/org') diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java index 4c692e7..ce9ba5b 100644 --- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java +++ b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class CsarParserTest { - CsarParser csarParser = new CsarParser(); + String regex = "^\\/[a-zA-Z]\\:\\/"; ClassLoader classLoader = getClass().getClassLoader(); Pattern pattern = Pattern.compile(regex); @@ -33,10 +33,10 @@ public class CsarParserTest { Matcher matcher = pattern.matcher(configFile); String dir2 = "/"+configFile.substring(1); + CsarParser csarParser = new CsarParser(dir2); + @Test public void testValidateCsarMeta() { - boolean result1 = csarParser.csarExtract(dir2); - // assertEquals(true, result = true); boolean result = CsarParser.validateCsarMeta(); assertEquals(true, result == true); System.out.println("inside testValidateCsarMeta : " + result); @@ -51,7 +51,6 @@ public class CsarParserTest { @Test public void testValidateToscaMeta() { - boolean result1 = csarParser.csarExtract(dir2); boolean result = csarParser.validateToscaMeta(); assertEquals(true, result == true); System.out.println("inside testValidateToscaMeta : " + result); -- cgit 1.2.3-korg