Support Groups during Import Service

[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / impl / ServiceImportParseLogicTest.java

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogicTest.java
index 368b388..d16dc23 100644 (file)
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogicTest.java
@@ -37,12 +37,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
-import java.util.Set;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.jupiter.api.Assertions;
@@ -57,13 +55,10 @@ import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.datatypes.elements.CINodeFilterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ListRequirementDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.RequirementNodeFilterPropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -90,7 +85,6 @@ import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.UploadCapInfo;
 import org.openecomp.sdc.be.model.UploadComponentInstanceInfo;
 import org.openecomp.sdc.be.model.UploadNodeFilterInfo;
-import org.openecomp.sdc.be.model.UploadNodeFilterPropertyInfo;
 import org.openecomp.sdc.be.model.UploadPropInfo;
 import org.openecomp.sdc.be.model.UploadReqInfo;
 import org.openecomp.sdc.be.model.User;
@@ -373,27 +367,6 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
             testSubject.getComponentTypeForResponse(service));
     }
 
-    @Test
-    void testIsfillGroupMemebersRecursivlyStopCondition() {
-        String groupName = "groupName";
-        Map<String, GroupDefinition> allGroups = new HashMap<>();
-        Set<String> allGroupMembers = new HashSet<>();
-        Assertions.assertTrue(testSubject.isfillGroupMemebersRecursivlyStopCondition(groupName, allGroups, allGroupMembers));
-    }
-
-    @Test
-    void testIsfillGroupMemebersRecursivlyStopCondition2() {
-        String groupName = "groupName";
-        Map<String, GroupDefinition> allGroups = new HashMap<>();
-        GroupDefinition groupDefinition = new GroupDefinition();
-        Map<String, String> members = new HashMap<>();
-        members.put("members", "members");
-        groupDefinition.setMembers(members);
-        allGroups.put(groupName, groupDefinition);
-        Set<String> allGroupMembers = new HashSet<>();
-        Assertions.assertTrue(testSubject.isfillGroupMemebersRecursivlyStopCondition(groupName, allGroups, allGroupMembers));
-    }
-
     @Test
     void testBuildValidComplexVfc() {
         Resource resource = createParseResourceObject(true);
@@ -871,7 +844,7 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
         String capName = "capName";
 
         Assertions.assertNotNull(
-            testSubject.findAviableRequiremen(regName, yamlName, uploadComponentInstanceInfo, currentCompInstance, capName));
+            testSubject.findAvailableRequirement(regName, yamlName, uploadComponentInstanceInfo, currentCompInstance, capName));
     }
 
     @Test
@@ -894,7 +867,7 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
 
         String capName = uniqueId;
         Assertions.assertNotNull(
-            testSubject.findAviableRequiremen(regName, yamlName, uploadComponentInstanceInfo, currentCompInstance, capName));
+            testSubject.findAvailableRequirement(regName, yamlName, uploadComponentInstanceInfo, currentCompInstance, capName));
     }
 
     @Test
@@ -1163,7 +1136,7 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
     }
 
     @Test
-    public void testAssociateCINodeFilterToComponent() {
+    void testAssociateCINodeFilterToComponent() {
         String yamlName = "yamlName.yml";
         Service service = createServiceObject(true);
         Map<String, UploadNodeFilterInfo> nodeFilterMap = new HashMap<>();
@@ -1178,7 +1151,7 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
     }
 
     @Test
-    public void testAssociateCINodeFilterToComponentFail() {
+    void testAssociateCINodeFilterToComponentFail() {
         String yamlName = "yamlName.yml";
         Service service = createServiceObject(true);
         Map<String, UploadNodeFilterInfo> nodeFilterMap = new HashMap<>();
@@ -1412,45 +1385,6 @@ class ServiceImportParseLogicTest extends ServiceImportBussinessLogicBaseTestSet
             testSubject.updateGroupMembers(groups, updatedGroupDefinition, component, componentInstances, groupName, members));
     }
 
-    @Test
-    void testValidateCyclicGroupsDependencies() {
-        Service component = createServiceObject(true);
-        Map<String, GroupDefinition> groups = new HashMap<>();
-        String key = "098738485";
-        GroupDefinition groupDefinition = new GroupDefinition();
-        groups.put(key, groupDefinition);
-
-        Assertions.assertNotNull(
-            testSubject.validateCyclicGroupsDependencies(groups));
-    }
-
-    @Test
-    void testFillAllGroupMemebersRecursivly() {
-        Map<String, GroupDefinition> allGroups = new HashMap<>();
-        Set<String> allGroupMembers = new HashSet<>();
-        String groupName = "groupName";
-        Assertions.assertNotNull(groupName);
-
-        testSubject.fillAllGroupMemebersRecursivly(groupName, allGroups, allGroupMembers);
-    }
-
-    @Test
-    void testFillAllGroupMemebersRecursivlyAllGroups() {
-        String groupName = "groupName";
-        Map<String, GroupDefinition> allGroups = new HashMap<>();
-        GroupDefinition groupDefinition = new GroupDefinition();
-        Map<String, String> members = new HashMap<>();
-        members.put("members", "members");
-        groupDefinition.setMembers(members);
-        allGroups.put(groupName, groupDefinition);
-        allGroups.put("members", groupDefinition);
-        Set<String> allGroupMembers = new HashSet<>();
-        allGroupMembers.add("allGroupMembers");
-        Assertions.assertNotNull(allGroups);
-
-        testSubject.fillAllGroupMemebersRecursivly(groupName, allGroups, allGroupMembers);
-    }
-
     @Test
     void testFillResourceMetadataForServiceFailure() {
         String yamlName = "yamlName";