1 files changed, 13 insertions, 10 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java
index 5b04c6c6f8..37174a91e7 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java
@@ -16,11 +16,14 @@
 
 package org.openecomp.sdc.heat.services.tree;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -50,8 +53,8 @@ public class HeatTreeManagerTest {
     HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(fileContentMap);
     heatTreeManager.createTree();
     HeatStructureTree tree = heatTreeManager.getTree();
-    Assert.assertNotNull(tree);
-    Assert.assertEquals(tree.getHeat().size(), 2);
+    assertNotNull(tree);
+    assertEquals(tree.getHeat().size(), 2);
   }
 
   @Test
@@ -74,8 +77,8 @@ public class HeatTreeManagerTest {
     HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(fileContentMap);
     heatTreeManager.createTree();
     HeatStructureTree tree = heatTreeManager.getTree();
-    Assert.assertNotNull(tree);
-    Assert.assertEquals(tree.getHeat().size(), 3);
+    assertNotNull(tree);
+    assertEquals(tree.getHeat().size(), 3);
     verifyHeatArtifacts(tree, "ocgmgr.yaml", 1);
     verifyHeatArtifacts(tree, "ocgapp.yaml", 0);
     verifyHeatArtifacts(tree, "base_ocg.yaml", 0);
@@ -84,12 +87,12 @@ public class HeatTreeManagerTest {
 
   private void verifyHeatArtifacts(HeatStructureTree tree, String heatName, int expectedArtifactNum ) {
     HeatStructureTree heat = HeatStructureTree.getHeatStructureTreeByName(tree.getHeat(), heatName);
-    Assert.assertNotNull(heat);
+    assertNotNull(heat);
     if (expectedArtifactNum > 0) {
-      Assert.assertNotNull(heat.getArtifacts());
-      Assert.assertEquals(heat.getArtifacts().size(), expectedArtifactNum);
+      assertNotNull(heat.getArtifacts());
+      assertEquals(heat.getArtifacts().size(), expectedArtifactNum);
     } else {
-      Assert.assertNull(heat.getArtifacts());
+      assertNull(heat.getArtifacts());
     }
   }