sdc-tosca tests change and refactoring

Change-Id: Ibffb597a5197675499c7fe544fba953065f2f9bf
Issue-ID: SDC-752
Signed-off-by: Pavel Aharoni <pa0916@att.com>

4 files changed, 113 insertions, 29 deletions

diff --git a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
index 90124c5..74e52db 100644
--- a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
@@ -15,6 +15,7 @@ import org.openecomp.sdc.toscaparser.api.common.JToscaException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
 
 public abstract class SdcToscaParserBasicTest {
 
@@ -38,7 +39,7 @@ public abstract class SdcToscaParserBasicTest {
 
 	static Map<String, HashMap<String, List<String>>> fdntCsarHelper_Data;
     
-    @BeforeClass
+    @BeforeSuite
     public static void init() throws SdcToscaParserException, JToscaException, IOException {
 
         factory = SdcToscaParserFactory.getInstance();
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java
index 288cea6..87d8f09 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java
@@ -1,16 +1,40 @@
 package org.openecomp.sdc.impl;
 
-import static org.testng.Assert.assertEquals;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
+import org.apache.commons.io.IOUtils;
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
+import org.openecomp.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.openecomp.sdc.toscaparser.api.common.JToscaValidationIssue;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.testng.Assert.assertEquals;
+
 public class ToscaParserValidationIssueTest extends SdcToscaParserBasicTest {
+	protected static ConfigurationManager configurationManager = ConfigurationManager.getInstance();
+
+	@BeforeClass
+	public void loadJtoscaValidationIssueConfiguration() throws IOException {
+		//load the tests dedicated configuration
+		configurationManager.setJtoscaValidationIssueConfiguration( "jtosca-validation-issue-configuration-test.yaml");
+		factory.setConfigurationManager(configurationManager);
+	}
+
+	@AfterClass
+	public void loadJtoscaValidationIssueOriginalConfiguration() throws IOException {
+		//load the tests dedicated configuration
+		configurationManager.setJtoscaValidationIssueConfiguration("jtosca-validation-issue-configuration.yaml");
+		factory.setConfigurationManager(configurationManager);
+
+	}
+
 
 	@Test
 	public void testNoValidationIssues() throws SdcToscaParserException {
@@ -42,15 +66,25 @@ public class ToscaParserValidationIssueTest extends SdcToscaParserBasicTest {
 		List<JToscaValidationIssue> criticalsReport = factory.getCriticalExceptions();
 		assertEquals( criticalsReport.size(),0);
 	}
+
+	@Test(expectedExceptions = SdcToscaParserException.class)
+	public void testCriticalIssueThrowsSdcToscaParserException() throws SdcToscaParserException {
+		getCsarHelper("csars/service-Nfod2images-csar.csar");//conformance level 4.0
+	}
+
 	@Test
-	public void testMultiSinceConformanceLevelIssues() throws SdcToscaParserException {
-		ISdcCsarHelper Nfod2images = getCsarHelper("csars/service-Nfod2images-csar.csar");//conformance level 4.0
+	public void testMultiSinceConformanceLevelIssues() {
+		try {
+			ISdcCsarHelper Nfod2images = getCsarHelper("csars/service-Nfod2images-csar.csar");//conformance level 4.0
+		} catch (SdcToscaParserException e) {
+			System.out.println("SdcToscaParserException is caught here - this is WAD in this specific test.");
+		}
 		List<JToscaValidationIssue> notAnalyzedReport = factory.getNotAnalyzadExceptions();
-		assertEquals( notAnalyzedReport.size(),2);
+		assertEquals(2, notAnalyzedReport.size());
 		List<JToscaValidationIssue> warningsReport = factory.getWarningExceptions();
-		assertEquals( warningsReport.size(),0);
+		assertEquals( 0, warningsReport.size());
 		List<JToscaValidationIssue> criticalsReport = factory.getCriticalExceptions();
-		assertEquals( criticalsReport.size(),24);
+		assertEquals( 24, criticalsReport.size());
 		//JE006 multy values sinceCsarConformanceLevel
 		assertEquals( criticalsReport.stream().filter(c->c.getCode().equals("JE006")).collect(Collectors.toList()).size(), 18);
 		assertEquals( criticalsReport.stream().filter(c->c.getCode().equals("JE003")).collect(Collectors.toList()).size(), 6);
diff --git a/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml b/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml
new file mode 100644
index 0000000..1378ca7
--- /dev/null
+++ b/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml
@@ -0,0 +1,57 @@
+# jTosca validation issues
+#by error code, type the validation issue to be CRITICAL/WARNING
+# since Conformance level considered to this type. for example:
+#JE001:
+#      - type: WARNING,
+#        sinceCsarConformanceLevel: 3.0
+#      - type: WARNING,
+#        sinceCsarConformanceLevel: 5.0
+validationIssues:
+    # TypeMismatchError
+    JE001:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+        - issueType: CRITICAL
+          sinceCsarConformanceLevel: 4.0
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 5.0
+    # MissingType
+    JE002:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+    #MissingRequiredFieldError
+    JE003:
+        - issueType: CRITICAL
+          sinceCsarConformanceLevel: 4.0
+    #MissingRequiredFieldError2
+    JE004:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 2.0
+    #InvalidGroupTargetException
+    JE005:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+    #Schema definition of \"%s\" has \"status\" attribute with an invalid value
+    JE006:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+        - issueType: CRITICAL
+          sinceCsarConformanceLevel: 4.0
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 5.0
+    #The unit \"%s\" is not valid
+    JE007:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+    #ValidationError
+    JE008:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+    #ValueError: Expected max 2 arguments for function \"get_input\" but received \"%s\"",args.size())
+    JE009:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
+    #MissingRequiredFieldError3
+    JE010:
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
\ No newline at end of file
diff --git a/src/test/resources/config/jtosca-validation-issue-configuration.yaml b/src/test/resources/config/jtosca-validation-issue-configuration.yaml
index 1378ca7..f4bb949 100644
--- a/src/test/resources/config/jtosca-validation-issue-configuration.yaml
+++ b/src/test/resources/config/jtosca-validation-issue-configuration.yaml
@@ -1,32 +1,28 @@
-# jTosca validation issues
-#by error code, type the validation issue to be CRITICAL/WARNING
+# jTosca validation issues 
+#by error code, type the validation issue to be CRITICAL/WARNING 
 # since Conformance level considered to this type. for example:
-#JE001:
-#      - type: WARNING,
-#        sinceCsarConformanceLevel: 3.0
-#      - type: WARNING,
+#JE001: 
+#      - issueType: WARNING
+#        sinceCsarConformanceLevel: 3.0     
+#      - issueType: WARNING
 #        sinceCsarConformanceLevel: 5.0
 validationIssues:
     # TypeMismatchError
-    JE001:
+    JE001: 
         - issueType: WARNING
           sinceCsarConformanceLevel: 3.0
-        - issueType: CRITICAL
-          sinceCsarConformanceLevel: 4.0
-        - issueType: WARNING
-          sinceCsarConformanceLevel: 5.0
     # MissingType
     JE002:
         - issueType: WARNING
           sinceCsarConformanceLevel: 3.0
     #MissingRequiredFieldError
     JE003:
-        - issueType: CRITICAL
-          sinceCsarConformanceLevel: 4.0
+        - issueType: WARNING
+          sinceCsarConformanceLevel: 3.0
     #MissingRequiredFieldError2
     JE004:
         - issueType: WARNING
-          sinceCsarConformanceLevel: 2.0
+          sinceCsarConformanceLevel: 3.0
     #InvalidGroupTargetException
     JE005:
         - issueType: WARNING
@@ -35,10 +31,6 @@ validationIssues:
     JE006:
         - issueType: WARNING
           sinceCsarConformanceLevel: 3.0
-        - issueType: CRITICAL
-          sinceCsarConformanceLevel: 4.0
-        - issueType: WARNING
-          sinceCsarConformanceLevel: 5.0
     #The unit \"%s\" is not valid
     JE007:
         - issueType: WARNING