Merge "Fixed resources not being closed in tests"

7 files changed, 250 insertions, 140 deletions

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileContentHandler.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileContentHandler.java
index 8de222e688..d5cd56e058 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileContentHandler.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileContentHandler.java
@@ -23,10 +23,13 @@ package org.openecomp.core.utilities.file;
 import org.apache.commons.collections4.MapUtils;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 
 public class FileContentHandler {
 
@@ -45,12 +48,31 @@ public class FileContentHandler {
       return null;
     }
 
-    ByteArrayInputStream is = new ByteArrayInputStream(content);
-    return is;
+    return new ByteArrayInputStream(content);
   }
 
-  public void addFile(String fileName, byte[] contect) {
-    files.put(fileName, contect);
+  /**
+   * Applies a business logic to a file's content while taking care of all retrieval logic.
+   *
+   * @param fileName name of a file inside this content handler.
+   * @param processor the business logic to work on the file's input stream, which may not be set
+   *                  (check the {@link Optional} if no such file can be found
+   * @param <T> return type, may be {@link java.lang.Void}
+   *
+   * @return result produced by the processor
+   */
+  public <T> T processFileContent(String fileName, Function<Optional<InputStream>, T> processor) {
+
+    // do not throw IOException to mimic the existing uses of getFileContent()
+    try (InputStream contentInputStream = getFileContent(fileName)) {
+      return processor.apply(Optional.ofNullable(contentInputStream));
+    } catch (IOException e) {
+      throw new ProcessingException("Failed to process file: " + fileName, e);
+    }
+  }
+
+  public void addFile(String fileName, byte[] content) {
+    files.put(fileName, content);
   }
 
   public void addFile(String fileName, InputStream is) {
@@ -94,4 +116,26 @@ public class FileContentHandler {
   public boolean containsFile(String fileName) {
     return files.containsKey(fileName);
   }
+
+  /**
+   * An application-specific runtime exception
+   */
+  private static class ProcessingException extends RuntimeException {
+
+    public ProcessingException() {
+      super();
+    }
+
+    public ProcessingException(String message) {
+      super(message);
+    }
+
+    public ProcessingException(Throwable cause) {
+      super(cause);
+    }
+
+    public ProcessingException(String msg, Throwable cause) {
+      super(msg, cause);
+    }
+  }
 }
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java
new file mode 100644
index 0000000000..527ba22c1d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/file/FileContentHandlerTest.java
@@ -0,0 +1,53 @@
+package org.openecomp.core.utilities.file;
+
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Optional;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author EVITALIY
+ * @since 24 Oct 17
+ */
+public class FileContentHandlerTest {
+
+    private static final String FILE_NAME = "test-file.txt";
+
+    @Test
+    public void testProcessFileContent() throws Exception {
+
+        final int size = 13;
+        FileContentHandler contentHandler = new FileContentHandler();
+        final byte[] content = new byte[size];
+        Arrays.fill(content, (byte) 44);
+        contentHandler.addFile(FILE_NAME, content);
+        assertEquals(contentHandler.processFileContent(FILE_NAME, optional -> {
+
+            try {
+                byte[] buffer = new byte[size];
+                assertTrue(optional.isPresent());
+                assertEquals(size, optional.get().read(buffer));
+                return buffer;
+            } catch (IOException e) {
+                throw new RuntimeException("Unexpected error", e);
+            }
+
+        }), content);
+    }
+
+    @Test
+    public void testProcessEmptyFileContent() throws Exception {
+        FileContentHandler contentHandler = new FileContentHandler();
+        contentHandler.addFile(FILE_NAME, new byte[0]);
+        assertFalse(contentHandler.processFileContent(FILE_NAME, Optional::isPresent));
+    }
+
+    @Test
+    public void testProcessNoFileContent() throws Exception {
+        FileContentHandler contentHandler = new FileContentHandler();
+        assertFalse(contentHandler.processFileContent("filename", Optional::isPresent));
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java
index fc01e2e8b0..6312e5a575 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/EnvironmentTest.java
@@ -23,16 +23,18 @@ package org.openecomp.sdc.heat.datatypes.model;
 import org.junit.Test;
 import org.openecomp.sdc.tosca.services.YamlUtil;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 public class EnvironmentTest {
 
   @Test
-  public void testYamlToServiceTemplateObj() {
+  public void testYamlToServiceTemplateObj() throws IOException {
     YamlUtil yamlUtil = new YamlUtil();
-    InputStream yamlFile = yamlUtil.loadYamlFileIs("/mock/model/envSettings.env");
-    Environment envVars = yamlUtil.yamlToObject(yamlFile, Environment.class);
-    envVars.toString();
+    try (InputStream yamlFile = yamlUtil.loadYamlFileIs("/mock/model/envSettings.env")) {
+      Environment envVars = yamlUtil.yamlToObject(yamlFile, Environment.class);
+      envVars.toString();
+    }
   }
 
   @Test
@@ -46,9 +48,8 @@ public class EnvironmentTest {
     if (heatResourceName.length() == lastIndexOfUnderscore) {
       System.out.println(heatResourceName);
     } else {
-      String heatResourceNameSuffix = heatResourceName.substring(lastIndexOfUnderscore + 1);
+
       try {
-        int heatResourceNameSuffixInt = Integer.parseInt(heatResourceNameSuffix);
         System.out.println(heatResourceName.substring(0, lastIndexOfUnderscore));
       } catch (NumberFormatException ignored) {
         System.out.println(heatResourceName);
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java
index 3715b0f999..dd8abdc0b9 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/HeatOrchestrationTemplateTest.java
@@ -26,6 +26,7 @@ import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.tosca.services.YamlUtil;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,12 +38,13 @@ public class HeatOrchestrationTemplateTest {
   private final Logger log = (Logger) LoggerFactory.getLogger(this.getClass().getName());
 
   @Test
-  public void testYamlToServiceTemplateObj() {
+  public void testYamlToServiceTemplateObj() throws IOException {
     YamlUtil yamlUtil = new YamlUtil();
-    InputStream yamlFile = yamlUtil.loadYamlFileIs("/mock/model/testHeat.yml");
-    HeatOrchestrationTemplate heatOrchestrationTemplate =
-        yamlUtil.yamlToObject(yamlFile, HeatOrchestrationTemplate.class);
-    heatOrchestrationTemplate.toString();
+    try (InputStream yamlFile = yamlUtil.loadYamlFileIs("/mock/model/testHeat.yml")) {
+      HeatOrchestrationTemplate heatOrchestrationTemplate =
+              yamlUtil.yamlToObject(yamlFile, HeatOrchestrationTemplate.class);
+      heatOrchestrationTemplate.toString();
+    }
   }
 
   @Test
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java
index c7f4e3f6d1..e8c9c602f8 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/datatypes/ToscaModelTest.java
@@ -46,6 +46,7 @@ import org.openecomp.sdc.tosca.services.ToscaConstants;
 import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
 import org.openecomp.sdc.tosca.services.YamlUtil;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -271,27 +272,29 @@ public class ToscaModelTest {
 
 
   @Test
-  public void testYamlToServiceTemplateObj() {
-    InputStream yamlFile = new YamlUtil().loadYamlFileIs("/mock/model/serviceTemplate.yaml");
-    ServiceTemplate serviceTemplateFromYaml =
-        new YamlUtil().yamlToObject(yamlFile, ServiceTemplate.class);
-    Assert.assertNotNull(serviceTemplateFromYaml);
+  public void testYamlToServiceTemplateObj() throws IOException {
+    try (InputStream yamlFile = new YamlUtil().loadYamlFileIs("/mock/model/serviceTemplate.yaml")) {
+      ServiceTemplate serviceTemplateFromYaml =
+              new YamlUtil().yamlToObject(yamlFile, ServiceTemplate.class);
+      Assert.assertNotNull(serviceTemplateFromYaml);
+    }
   }
 
 
   @Test
-  public void testYamlToServiceTemplateIncludingHeatExtend() {
+  public void testYamlToServiceTemplateIncludingHeatExtend() throws IOException {
     ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-    InputStream yamlFile =
-        toscaExtensionYamlUtil.loadYamlFileIs("/mock/model/serviceTemplateHeatExtend.yaml");
-    ServiceTemplate serviceTemplateFromYaml =
-        toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
-    ParameterDefinitionExt parameterDefinitionExt =
-        (ParameterDefinitionExt) serviceTemplateFromYaml.getTopology_template().getInputs()
-            .get("inParam1");
-    Assert.assertNotNull(parameterDefinitionExt.getLabel());
-    String backToYamlString = toscaExtensionYamlUtil.objectToYaml(serviceTemplateFromYaml);
-    Assert.assertNotNull(backToYamlString);
+    try (InputStream yamlFile =
+        toscaExtensionYamlUtil.loadYamlFileIs("/mock/model/serviceTemplateHeatExtend.yaml")) {
+      ServiceTemplate serviceTemplateFromYaml =
+              toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
+      ParameterDefinitionExt parameterDefinitionExt =
+              (ParameterDefinitionExt) serviceTemplateFromYaml.getTopology_template().getInputs()
+                      .get("inParam1");
+      Assert.assertNotNull(parameterDefinitionExt.getLabel());
+      String backToYamlString = toscaExtensionYamlUtil.objectToYaml(serviceTemplateFromYaml);
+      Assert.assertNotNull(backToYamlString);
+    }
   }
 
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
index 7ae91abfa5..aad21634a8 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
@@ -78,9 +78,9 @@ public class ToscaAnalyzerServiceImplTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @Mock
-  NodeTemplate nodeTemplateMock;
+  private NodeTemplate nodeTemplateMock;
   @Mock
-  ToscaServiceModel toscaServiceModelMock;
+  private ToscaServiceModel toscaServiceModelMock;
 
   @BeforeClass
   public static void onlyOnceSetUp() throws IOException {
@@ -97,27 +97,29 @@ public class ToscaAnalyzerServiceImplTest {
   @Test
   public void testGetRequirements() throws Exception {
     ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-    InputStream yamlFile = toscaExtensionYamlUtil
-        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml");
-    ServiceTemplate
-        serviceTemplateFromYaml =
-        toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
-
-    NodeTemplate port_0 =
-        serviceTemplateFromYaml.getTopology_template().getNode_templates().get("cmaui_port_0");
-    List<RequirementAssignment> reqList =
-        toscaAnalyzerService.getRequirements(port_0, ToscaConstants.BINDING_REQUIREMENT_ID);
-    assertEquals(1, reqList.size());
-
-    reqList.clear();
-    NodeTemplate port_1 =
-        serviceTemplateFromYaml.getTopology_template().getNode_templates().get("cmaui1_port_1");
-    reqList = toscaAnalyzerService.getRequirements(port_1, ToscaConstants.LINK_REQUIREMENT_ID);
-    assertEquals(2, reqList.size());
-
-    reqList.clear();
-    reqList = toscaAnalyzerService.getRequirements(port_0, ToscaConstants.LINK_REQUIREMENT_ID);
-    assertEquals(0, reqList.size());
+    try (InputStream yamlFile = toscaExtensionYamlUtil
+        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml")) {
+
+      ServiceTemplate
+              serviceTemplateFromYaml =
+              toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
+
+      NodeTemplate port_0 =
+              serviceTemplateFromYaml.getTopology_template().getNode_templates().get("cmaui_port_0");
+      List<RequirementAssignment> reqList =
+              toscaAnalyzerService.getRequirements(port_0, ToscaConstants.BINDING_REQUIREMENT_ID);
+      assertEquals(1, reqList.size());
+
+      reqList.clear();
+      NodeTemplate port_1 =
+              serviceTemplateFromYaml.getTopology_template().getNode_templates().get("cmaui1_port_1");
+      reqList = toscaAnalyzerService.getRequirements(port_1, ToscaConstants.LINK_REQUIREMENT_ID);
+      assertEquals(2, reqList.size());
+
+      reqList.clear();
+      reqList = toscaAnalyzerService.getRequirements(port_0, ToscaConstants.LINK_REQUIREMENT_ID);
+      assertEquals(0, reqList.size());
+    }
   }
 
   @Test
@@ -171,44 +173,45 @@ public class ToscaAnalyzerServiceImplTest {
         .getSubstituteServiceTemplateName("invalid1", invalidSubstitutableNodeTemplate1);
     assertEquals(false, substituteServiceTemplateName.isPresent());
 
-    if (substitutableNodeTemplate.isPresent()) {
-      NodeTemplate invalidSubstitutableNodeTemplate2 = substitutableNodeTemplate.get();
-      Object serviceTemplateFilter = invalidSubstitutableNodeTemplate2.getProperties()
-          .get(ToscaConstants.SERVICE_TEMPLATE_FILTER_PROPERTY_NAME);
+    substitutableNodeTemplate.ifPresent(nodeTemplate -> {
+      Object serviceTemplateFilter = nodeTemplate.getProperties()
+              .get(ToscaConstants.SERVICE_TEMPLATE_FILTER_PROPERTY_NAME);
       ((Map) serviceTemplateFilter).clear();
       toscaAnalyzerService
-          .getSubstituteServiceTemplateName("invalid2", invalidSubstitutableNodeTemplate2);
+              .getSubstituteServiceTemplateName("invalid2", nodeTemplate);
 
-    }
+    });
   }
 
 
   @Test
   public void testGetSubstitutableNodeTemplates() throws Exception {
     ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-    InputStream yamlFile = toscaExtensionYamlUtil
-        .loadYamlFileIs("/mock/analyzerService/ServiceTemplateSubstituteTest.yaml");
-    ServiceTemplate serviceTemplateFromYaml =
-        toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
-
-    Map<String, NodeTemplate> substitutableNodeTemplates =
-        toscaAnalyzerService.getSubstitutableNodeTemplates(serviceTemplateFromYaml);
-    assertEquals(2, substitutableNodeTemplates.size());
-    assertNotNull(substitutableNodeTemplates.get("test_nested1"));
-    assertNotNull(substitutableNodeTemplates.get("test_nested2"));
+    try (InputStream yamlFile = toscaExtensionYamlUtil
+        .loadYamlFileIs("/mock/analyzerService/ServiceTemplateSubstituteTest.yaml")) {
+      ServiceTemplate serviceTemplateFromYaml =
+              toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
+
+      Map<String, NodeTemplate> substitutableNodeTemplates =
+              toscaAnalyzerService.getSubstitutableNodeTemplates(serviceTemplateFromYaml);
+      assertEquals(2, substitutableNodeTemplates.size());
+      assertNotNull(substitutableNodeTemplates.get("test_nested1"));
+      assertNotNull(substitutableNodeTemplates.get("test_nested2"));
+
+      ServiceTemplate emptyServiceTemplate = new ServiceTemplate();
+      emptyServiceTemplate.setTopology_template(new TopologyTemplate());
+      substitutableNodeTemplates =
+              toscaAnalyzerService.getSubstitutableNodeTemplates(emptyServiceTemplate);
+      assertEquals(0, substitutableNodeTemplates.size());
+    }
 
-    ServiceTemplate emptyServiceTemplate = new ServiceTemplate();
-    emptyServiceTemplate.setTopology_template(new TopologyTemplate());
-    substitutableNodeTemplates =
-        toscaAnalyzerService.getSubstitutableNodeTemplates(emptyServiceTemplate);
-    assertEquals(0, substitutableNodeTemplates.size());
-
-    yamlFile = toscaExtensionYamlUtil
-        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml");
-    serviceTemplateFromYaml = toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
-    substitutableNodeTemplates =
-        toscaAnalyzerService.getSubstitutableNodeTemplates(serviceTemplateFromYaml);
-    assertEquals(0, substitutableNodeTemplates.size());
+    try (InputStream yamlFile = toscaExtensionYamlUtil
+              .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml")) {
+      ServiceTemplate serviceTemplateFromYaml = toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
+      Map<String, NodeTemplate> substitutableNodeTemplates =
+              toscaAnalyzerService.getSubstitutableNodeTemplates(serviceTemplateFromYaml);
+      assertEquals(0, substitutableNodeTemplates.size());
+    }
   }
 
   @Test
@@ -217,35 +220,36 @@ public class ToscaAnalyzerServiceImplTest {
     thrown.expectMessage(
         "Invalid Tosca model data, missing 'Node Template' entry for 'Node Template' id cmaui_port_9");
     ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-    InputStream yamlFile = toscaExtensionYamlUtil
-        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml");
-    ServiceTemplate nestedServiceTemplateFromYaml =
-        toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
-
-    Optional<Map.Entry<String, NodeTemplate>> mappedNodeTemplate = toscaAnalyzerService
-        .getSubstitutionMappedNodeTemplateByExposedReq("NestedServiceTemplateSubstituteTest.yaml",
-            nestedServiceTemplateFromYaml, "local_storage_server_cmaui");
-    assertEquals(true, mappedNodeTemplate.isPresent());
-    if (mappedNodeTemplate.isPresent()) {
-      assertEquals("server_cmaui", mappedNodeTemplate.get().getKey());
-      assertNotNull(mappedNodeTemplate.get().getValue());
+    try (InputStream yamlFile = toscaExtensionYamlUtil
+        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml")) {
+      ServiceTemplate nestedServiceTemplateFromYaml =
+              toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
+
+      Optional<Map.Entry<String, NodeTemplate>> mappedNodeTemplate = toscaAnalyzerService
+              .getSubstitutionMappedNodeTemplateByExposedReq("NestedServiceTemplateSubstituteTest.yaml",
+                      nestedServiceTemplateFromYaml, "local_storage_server_cmaui");
+      assertEquals(true, mappedNodeTemplate.isPresent());
+      mappedNodeTemplate.ifPresent(stringNodeTemplateEntry -> {
+        assertEquals("server_cmaui", stringNodeTemplateEntry.getKey());
+        assertNotNull(stringNodeTemplateEntry.getValue());
+      });
+
+      mappedNodeTemplate = toscaAnalyzerService
+              .getSubstitutionMappedNodeTemplateByExposedReq("NestedServiceTemplateSubstituteTest.yaml",
+                      nestedServiceTemplateFromYaml, "link_cmaui_port_invalid");
+      assertEquals(true, mappedNodeTemplate.isPresent());
+      mappedNodeTemplate.ifPresent(stringNodeTemplateEntry -> {
+        assertEquals("server_cmaui", stringNodeTemplateEntry.getKey());
+        assertNotNull(stringNodeTemplateEntry.getValue());
+      });
+
+      ServiceTemplate mainServiceTemplate = toscaServiceModel.getServiceTemplates()
+              .get(toscaServiceModel.getEntryDefinitionServiceTemplate());
+      mappedNodeTemplate = toscaAnalyzerService.getSubstitutionMappedNodeTemplateByExposedReq(
+              toscaServiceModel.getEntryDefinitionServiceTemplate(), mainServiceTemplate,
+              "local_storage_server_cmaui");
+      assertEquals(false, mappedNodeTemplate.isPresent());
     }
-
-    mappedNodeTemplate = toscaAnalyzerService
-        .getSubstitutionMappedNodeTemplateByExposedReq("NestedServiceTemplateSubstituteTest.yaml",
-            nestedServiceTemplateFromYaml, "link_cmaui_port_invalid");
-    assertEquals(true, mappedNodeTemplate.isPresent());
-    if (mappedNodeTemplate.isPresent()) {
-      assertEquals("server_cmaui", mappedNodeTemplate.get().getKey());
-      assertNotNull(mappedNodeTemplate.get().getValue());
-    }
-
-    ServiceTemplate mainServiceTemplate = toscaServiceModel.getServiceTemplates()
-        .get(toscaServiceModel.getEntryDefinitionServiceTemplate());
-    mappedNodeTemplate = toscaAnalyzerService.getSubstitutionMappedNodeTemplateByExposedReq(
-        toscaServiceModel.getEntryDefinitionServiceTemplate(), mainServiceTemplate,
-        "local_storage_server_cmaui");
-    assertEquals(false, mappedNodeTemplate.isPresent());
   }
 
   @Test
@@ -283,14 +287,15 @@ public class ToscaAnalyzerServiceImplTest {
     thrown.expectMessage(
         "Invalid Tosca model data, missing 'Node Template' entry for 'Node Template' id cmaui_port_9");
     ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-    InputStream yamlFile = toscaExtensionYamlUtil
-        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml");
-    ServiceTemplate nestedServiceTemplateFromYaml =
-        toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
+    try (InputStream yamlFile = toscaExtensionYamlUtil
+        .loadYamlFileIs("/mock/analyzerService/NestedServiceTemplateReqTest.yaml")) {
+      ServiceTemplate nestedServiceTemplateFromYaml =
+              toscaExtensionYamlUtil.yamlToObject(yamlFile, ServiceTemplate.class);
 
-    toscaAnalyzerService
-        .getSubstitutionMappedNodeTemplateByExposedReq("NestedServiceTemplateSubstituteTest.yaml",
-            nestedServiceTemplateFromYaml, "link_cmaui_port_invalid");
+      toscaAnalyzerService
+              .getSubstitutionMappedNodeTemplateByExposedReq("NestedServiceTemplateSubstituteTest.yaml",
+                      nestedServiceTemplateFromYaml, "link_cmaui_port_invalid");
+    }
   }
 
   @Test
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java
index 4d025e1540..66dda12b4b 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java
@@ -41,7 +41,7 @@ import java.util.zip.ZipFile;
 
 public class ToscaFileOutputServiceCsarImplTest {
 
-  private ToscaFileOutputServiceCsarImpl toscaFileOutputServiceCSARImpl =
+  private final ToscaFileOutputServiceCsarImpl toscaFileOutputServiceCSARImpl =
       new ToscaFileOutputServiceCsarImpl();
 
   @Test
@@ -112,21 +112,22 @@ public class ToscaFileOutputServiceCsarImplTest {
 
     String resultFileName = "resultFile.zip";
     File file = new File(resultFileName);
-    FileOutputStream fos = new FileOutputStream(file);
-    fos.write(csarFile);
-    fos.close();
+    try (FileOutputStream fos = new FileOutputStream(file)) {
+      fos.write(csarFile);
+    }
 
-    ZipFile zipFile = new ZipFile(resultFileName);
+    try (ZipFile zipFile = new ZipFile(resultFileName)) {
 
-    Enumeration<? extends ZipEntry> entries = zipFile.entries();
+      Enumeration<? extends ZipEntry> entries = zipFile.entries();
 
-    int count = 0;
-    while (entries.hasMoreElements()) {
-      count++;
-      entries.nextElement();
+      int count = 0;
+      while (entries.hasMoreElements()) {
+        count++;
+        entries.nextElement();
+      }
+      Assert.assertEquals(7, count);
     }
-    Assert.assertEquals(7, count);
-    zipFile.close();
+
     Files.delete(Paths.get(file.getPath()));
   }
 
@@ -150,21 +151,22 @@ public class ToscaFileOutputServiceCsarImplTest {
 
     String resultFileName = "resultFile.zip";
     File file = new File(resultFileName);
-    FileOutputStream fos = new FileOutputStream(file);
-    fos.write(csarFile);
-    fos.close();
+    try (FileOutputStream fos = new FileOutputStream(file)) {
+      fos.write(csarFile);
+    }
 
-    ZipFile zipFile = new ZipFile(resultFileName);
+    try (ZipFile zipFile = new ZipFile(resultFileName)) {
 
-    Enumeration<? extends ZipEntry> entries = zipFile.entries();
+      Enumeration<? extends ZipEntry> entries = zipFile.entries();
 
-    int count = 0;
-    while (entries.hasMoreElements()) {
-      count++;
-      entries.nextElement();
+      int count = 0;
+      while (entries.hasMoreElements()) {
+        count++;
+        entries.nextElement();
+      }
+      Assert.assertEquals(2, count);
     }
-    Assert.assertEquals(2, count);
-    zipFile.close();
+
     Files.delete(Paths.get(file.getPath()));
   }
 }