1 files changed, 16 insertions, 13 deletions
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
index 0725cb9..1746042 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
@@ -3,7 +3,6 @@ package org.openecomp.sdc.impl;
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;
 import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 import org.testng.annotations.Test;
@@ -206,19 +205,23 @@ public class ToscaParserMetadataTest extends SdcToscaParserBasicTest {
   @Test
   public void testCSARMissingConformanceLevelWithCustomErrorConfig() throws
       SdcToscaParserException {
+
     ConfigurationManager configurationManager = ConfigurationManager.getInstance();
-    configurationManager.setErrorConfiguration("error-configuration-test.yaml");
-    SdcToscaParserFactory.setConfigurationManager(configurationManager);
-
-    ISdcCsarHelper missingCSARMetaCsarCustomConfig = getCsarHelper
-        ("csars/service-missing-csar-meta-file.csar");
-    String conformanceLevel = missingCSARMetaCsarCustomConfig.getConformanceLevel();
-    assertNotNull(conformanceLevel);
-    assertEquals(conformanceLevel, configurationManager.getConfiguration().getConformanceLevel()
-        .getMaxVersion());
-
-    configurationManager.setErrorConfiguration("error-configuration.yaml");
-    SdcToscaParserFactory.setConfigurationManager(configurationManager);
+    try {
+      configurationManager.setErrorConfiguration("error-configuration-test.yaml");
+      factory.setConfigurationManager(configurationManager);
+      ISdcCsarHelper missingCSARMetaCsarCustomConfig = getCsarHelper
+          ("csars/service-missing-csar-meta-file.csar");
+      String conformanceLevel = missingCSARMetaCsarCustomConfig.getConformanceLevel();
+      assertNotNull(conformanceLevel);
+      assertEquals(conformanceLevel, configurationManager.getConfiguration().getConformanceLevel()
+          .getMaxVersion());
+    }
+    finally {
+      configurationManager.setErrorConfiguration("error-configuration.yaml");
+      factory.setConfigurationManager(configurationManager);
+    }
+
   }
 
   @Test(expectedExceptions = SdcToscaParserException.class)