1 files changed, 27 insertions, 15 deletions

diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserConfigurationTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserConfigurationTest.java
index b815064..b57522d 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserConfigurationTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserConfigurationTest.java
@@ -6,15 +6,13 @@ import org.testng.annotations.Test;
 import org.openecomp.sdc.tosca.parser.config.Configuration;
 import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
 
-import java.io.IOException;
-
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 public class ToscaParserConfigurationTest extends SdcToscaParserBasicTest {
 
     @Test
-    public void testConfigurationConformanceLevel() throws IOException {
+    public void testConfigurationConformanceLevel()  {
         Configuration config = ConfigurationManager.getInstance().getConfiguration();
         assertNotNull(config);
         assertNotNull(config.getConformanceLevel());
@@ -24,28 +22,42 @@ public class ToscaParserConfigurationTest extends SdcToscaParserBasicTest {
 
 
     @Test
-    public void testErrorConfigurations() throws IOException {
+    public void testErrorConfigurations()  {
         ErrorConfiguration errorConfig = ConfigurationManager.getInstance().getErrorConfiguration();
         assertNotNull(errorConfig);
         assertNotNull(errorConfig.getErrors());
     }
 
     @Test
-    public void testSetErrorConfiguration() throws IOException {
+    public void testSetErrorConfiguration() {
         ConfigurationManager configurationManager = ConfigurationManager.getInstance();
-        configurationManager.setErrorConfiguration("error-configuration-test.yaml");
-        ErrorConfiguration errorConfig = configurationManager.getErrorConfiguration();
-        assertEquals(false, errorConfig.getErrorInfo("CONFORMANCE_LEVEL_ERROR").getFailOnError());
-        assertEquals(true, errorConfig.getErrorInfo("FILE_NOT_FOUND").getFailOnError());
+        try {
+            configurationManager.setErrorConfiguration("error-configuration-test.yaml");
+            ErrorConfiguration errorConfig = configurationManager.getErrorConfiguration();
+            assertEquals(false,
+                errorConfig.getErrorInfo("CONFORMANCE_LEVEL_ERROR").getFailOnError());
+            assertEquals(true, errorConfig.getErrorInfo("FILE_NOT_FOUND").getFailOnError());
+        }
+        finally {
+            // Reset the configuration for other tests
+            configurationManager.setErrorConfiguration("error-configuration.yaml");
+        }
     }
 
     @Test
-    public void testSetJtoscaValidationIssueConfiguration() throws IOException {
+    public void testSetJtoscaValidationIssueConfiguration() {
         ConfigurationManager configurationManager = ConfigurationManager.getInstance();
-        configurationManager.setJtoscaValidationIssueConfiguration(
-            "jtosca-validation-issue-configuration-test.yaml");
-        JtoscaValidationIssueConfiguration issueConfig = configurationManager
-            .getJtoscaValidationIssueConfiguration();
-        assertNotNull(issueConfig);
+        try {
+            configurationManager.setJtoscaValidationIssueConfiguration(
+                "jtosca-validation-issue-configuration-test.yaml");
+            JtoscaValidationIssueConfiguration issueConfig = configurationManager
+                .getJtoscaValidationIssueConfiguration();
+            assertNotNull(issueConfig);
+        }
+        finally {
+            // Reset the configuration for other tests
+            configurationManager.setJtoscaValidationIssueConfiguration
+                ("jtosca-validation-issue-configuration.yaml");
+        }
     }
 }