1 files changed, 14 insertions, 14 deletions
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
index 0bda21e..706c864 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
@@ -1,20 +1,20 @@
 package org.openecomp.sdc.impl;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.openecomp.sdc.toscaparser.api.Group;
 import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 public class ToscaParserGroupTest extends BasicTest{
 
     //region getVfModulesByVf
     @Test
     public void testVfModulesFromVf(){
-        List<Group> vfModulesByVf = ToscaParserTestSuite.fdntCsarHelper.getVfModulesByVf(ToscaParserTestSuite.VF_CUSTOMIZATION_UUID);
+        List<Group> vfModulesByVf = fdntCsarHelper.getVfModulesByVf(VF_CUSTOMIZATION_UUID);
         assertEquals(2, vfModulesByVf.size());
         for (Group group : vfModulesByVf){
             assertTrue(group.getName().startsWith("fdnt1"));
@@ -25,7 +25,7 @@ public class ToscaParserGroupTest extends BasicTest{
 
     @Test
     public void testGetGroupMetadata(){
-        List<Group> vfModulesByVf = ToscaParserTestSuite.fdntCsarHelper.getVfModulesByVf(ToscaParserTestSuite.VF_CUSTOMIZATION_UUID);
+        List<Group> vfModulesByVf = fdntCsarHelper.getVfModulesByVf(VF_CUSTOMIZATION_UUID);
         boolean found = false;
         for (Group group : vfModulesByVf){
             if (group.getName().equals("fdnt1..Fdnt..base_stsi_dnt_frwl..module-0")){
@@ -40,7 +40,7 @@ public class ToscaParserGroupTest extends BasicTest{
 
     @Test
     public void testGetGroupEmptyMetadata(){
-        List<Group> vfModulesByVf = ToscaParserTestSuite.rainyCsarHelperMultiVfs.getVfModulesByVf("56179cd8-de4a-4c38-919b-bbc4452d2d72");
+        List<Group> vfModulesByVf = rainyCsarHelperMultiVfs.getVfModulesByVf("56179cd8-de4a-4c38-919b-bbc4452d2d72");
         boolean found = false;
         for (Group group : vfModulesByVf){
             if (group.getName().equals("fdnt1..Fdnt..base_stsi_dnt_frwl..module-0")){
@@ -54,14 +54,14 @@ public class ToscaParserGroupTest extends BasicTest{
 
     @Test
     public void testGetVfModuleNonExisitingVf() {
-        List<Group> vfModulesByVf = ToscaParserTestSuite.rainyCsarHelperSingleVf.getVfModulesByVf("dummy");
+        List<Group> vfModulesByVf = rainyCsarHelperSingleVf.getVfModulesByVf("dummy");
         assertNotNull(vfModulesByVf);
         assertEquals(0, vfModulesByVf.size());
     }
 
     @Test
     public void testGetVfModuleNullVf() {
-        List<Group> vfModulesByVf = ToscaParserTestSuite.rainyCsarHelperSingleVf.getVfModulesByVf(null);
+        List<Group> vfModulesByVf = rainyCsarHelperSingleVf.getVfModulesByVf(null);
         assertNotNull(vfModulesByVf);
         assertEquals(0, vfModulesByVf.size());
     }
@@ -70,28 +70,28 @@ public class ToscaParserGroupTest extends BasicTest{
     //region getGroupPropertyLeafValue
     @Test
     public void testGroupFlatProperty() throws SdcToscaParserException {
-        List<Group> vfModulesByVf = ToscaParserTestSuite.fdntCsarHelper.getVfModulesByVf(ToscaParserTestSuite.VF_CUSTOMIZATION_UUID);
-        String volumeGroup = ToscaParserTestSuite.fdntCsarHelper.getGroupPropertyLeafValue(vfModulesByVf.get(0), "volume_group");
+        List<Group> vfModulesByVf = fdntCsarHelper.getVfModulesByVf(VF_CUSTOMIZATION_UUID);
+        String volumeGroup = fdntCsarHelper.getGroupPropertyLeafValue(vfModulesByVf.get(0), "volume_group");
         assertEquals("false", volumeGroup);
     }
 
     @Test
     public void testGroupPropertyLeafValueByNullProperty() {
-        List<Group> vfModulesByVf = ToscaParserTestSuite.fdntCsarHelper.getVfModulesByVf(ToscaParserTestSuite.VF_CUSTOMIZATION_UUID);
-        String groupProperty = ToscaParserTestSuite.fdntCsarHelper.getGroupPropertyLeafValue(vfModulesByVf.get(0), null);
+        List<Group> vfModulesByVf = fdntCsarHelper.getVfModulesByVf(VF_CUSTOMIZATION_UUID);
+        String groupProperty = fdntCsarHelper.getGroupPropertyLeafValue(vfModulesByVf.get(0), null);
         assertNull(groupProperty);
     }
 
     @Test
     public void testGroupPropertyLeafValueByDummyProperty() {
-        List<Group> vfModulesByVf = ToscaParserTestSuite.fdntCsarHelper.getVfModulesByVf(ToscaParserTestSuite.VF_CUSTOMIZATION_UUID);
-        String groupProperty = ToscaParserTestSuite.fdntCsarHelper.getGroupPropertyLeafValue(vfModulesByVf.get(0), "XXX");
+        List<Group> vfModulesByVf = fdntCsarHelper.getVfModulesByVf(VF_CUSTOMIZATION_UUID);
+        String groupProperty = fdntCsarHelper.getGroupPropertyLeafValue(vfModulesByVf.get(0), "XXX");
         assertNull(groupProperty);
     }
 
     @Test
     public void testGroupPropertyLeafValueByNullGroup() {
-        String groupProperty = ToscaParserTestSuite.fdntCsarHelper.getGroupPropertyLeafValue(null, "volume_group");
+        String groupProperty = fdntCsarHelper.getGroupPropertyLeafValue(null, "volume_group");
         assertNull(groupProperty);
     }
     //endregion