Refactor HEAT tree test for error handling

[sdc.git] / openecomp-be / backend / openecomp-sdc-vendor-software-product-manager / src / test / java / org / openecomp / sdc / vendorsoftwareproduct / tree / HeatTreeManagerTest.java

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/HeatTreeManagerTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/HeatTreeManagerTest.java
index baa0d8d..1ee1e2a 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/HeatTreeManagerTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/tree/HeatTreeManagerTest.java
@@ -1,47 +1,42 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============LICENSE_END=========================================================
  */
 
 package org.openecomp.sdc.vendorsoftwareproduct.tree;
 
-import org.openecomp.sdc.datatypes.error.ErrorLevel;
-import org.openecomp.sdc.datatypes.error.ErrorMessage;
-import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
-import org.openecomp.sdc.heat.services.tree.HeatTreeManager;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.datatypes.error.ErrorMessage;
+import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
+import org.openecomp.sdc.heat.services.tree.HeatTreeManager;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 
 public class HeatTreeManagerTest extends TreeBaseTest {
 
   @Test
-  public void testHeatTreeManager() {
+  public void testHeatTreeManager() throws IOException, URISyntaxException {
 
-    INPUT_DIR = "./tree/valid_tree/input/";
-    HeatTreeManager heatTreeManager = initHeatTreeManager();
+    HeatTreeManager heatTreeManager = initHeatTreeManager("./tree/valid_tree/input/");
     heatTreeManager.createTree();
     Map<String, List<ErrorMessage>> errorMap = new HashMap<>();
 
@@ -57,10 +52,9 @@ public class HeatTreeManagerTest extends TreeBaseTest {
   }
 
   @Test
-  public void testHeatTreeManagerMissingManifest() {
+  public void testHeatTreeManagerMissingManifest() throws IOException, URISyntaxException {
 
-    INPUT_DIR = "./tree/missing_manifest/input/";
-    HeatTreeManager heatTreeManager = initHeatTreeManager();
+    HeatTreeManager heatTreeManager = initHeatTreeManager("./tree/missing_manifest/input/");
     heatTreeManager.createTree();
     Map<String, List<ErrorMessage>> errorMap = new HashMap<>();
 
@@ -73,15 +67,15 @@ public class HeatTreeManagerTest extends TreeBaseTest {
     heatTreeManager.addErrors(errorMap);
     HeatStructureTree tree = heatTreeManager.getTree();
     Assert.assertNotNull(tree);
-    Assert.assertEquals(tree.getHeat(), null);
+    Assert.assertNull(tree.getHeat());
 
   }
 
 
   @Test
-  public void testResourceGroupShowsAsNestedFileInTree() throws IOException {
-    INPUT_DIR = "./tree/nested_resource_group";
-    HeatTreeManager heatTreeManager = initHeatTreeManager();
+  public void testResourceGroupShowsAsNestedFileInTree() throws IOException, URISyntaxException {
+
+    HeatTreeManager heatTreeManager = initHeatTreeManager("./tree/nested_resource_group");
     heatTreeManager.createTree();
     HeatStructureTree tree = heatTreeManager.getTree();
 
@@ -102,9 +96,9 @@ public class HeatTreeManagerTest extends TreeBaseTest {
 
 
   @Test
-  public void testVolumeNestedFileIsNotUnderVolumeSubTree() {
-    INPUT_DIR = "./tree/nested_volume";
-    HeatTreeManager heatTreeManager = initHeatTreeManager();
+  public void testVolumeNestedFileIsNotUnderVolumeSubTree() throws IOException, URISyntaxException {
+
+    HeatTreeManager heatTreeManager = initHeatTreeManager("./tree/nested_volume");
     heatTreeManager.createTree();
     HeatStructureTree tree = heatTreeManager.getTree();