X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-config%2Fappc-flow-controller%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fappc%2Fflow%2Fcontroller%2Fnode%2FFlowControlNodeTest.java;h=b3c47925ac7db6e03f80156e65008d330e416bfb;hb=04d834a8258742f4c4acc4fb59224f255e953d75;hp=d171f5f8b63a394678538ca0df3c7ed8c0ef98dc;hpb=bcc0324b5862a1d1bc46a4d5f8564431e8b3862e;p=appc.git

diff --git a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/FlowControlNodeTest.java b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/FlowControlNodeTest.java
index d171f5f8b..b3c47925a 100644
--- a/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/FlowControlNodeTest.java
+++ b/appc-config/appc-flow-controller/provider/src/test/java/org/onap/appc/flow/controller/node/FlowControlNodeTest.java
@@ -36,67 +36,23 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.appc.flow.controller.dbervices.FlowControlDBService;
-import org.onap.appc.flow.controller.interfaceData.Capabilities;
 import org.onap.appc.flow.controller.interfaceData.DependencyInfo;
 import org.onap.appc.flow.controller.interfaceData.Vnfcs;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class FlowControlNodeTest {
 
-  private SvcLogicContext ctx;
   private FlowControlDBService dbService;
+  private SvcLogicContext ctx;
+  private FlowControlNode flowControlNode;
+  private FlowSequenceGenerator flowSequenceGenerator;
 
   @Before
   public void setUp() {
     ctx = mock(SvcLogicContext.class);
     dbService = mock(FlowControlDBService.class);
-  }
-
-  @Test
-  public void should_handle_capabilities_full_config() throws Exception {
-
-    String jsonPayload = "{'vnf':['vnf-1', 'vnf-2'],'vf-module':['vf-module-1', 'vf-module-2'],'vnfc':['vnfc-1', 'vnfc-2'],'vm':['vm-1', 'vm-2']}";
-    when(dbService.getCapabilitiesData(ctx)).thenReturn(jsonPayload.replaceAll("'","\""));
-
-    FlowControlNode flowControlNode = new FlowControlNode(null, dbService);
-    Capabilities capabilitiesData = flowControlNode.getCapabilitiesData(ctx);
-
-    Assert.assertEquals("Capabilities [vnf=[vnf-1, vnf-2], vfModule=[vf-module-1, vf-module-2], vm=[vm-1, vm-2], vnfc=[vnfc-1, vnfc-2]]", capabilitiesData.toString());
-  }
-
-  @Test
-  public void should_handle_capabilities_config_with_missing_params() throws Exception {
-
-    // vm is empty, vnfc is absent
-    String jsonPayload = "{'vnf':['vnf-1', 'vnf-2'],'vf-module':['vf-module-1'],'vm':[]}";
-    when(dbService.getCapabilitiesData(ctx)).thenReturn(jsonPayload.replaceAll("'","\""));
-
-    FlowControlNode flowControlNode = new FlowControlNode(null, dbService);
-    Capabilities capabilitiesData = flowControlNode.getCapabilitiesData(ctx);
-
-    Assert.assertEquals("Capabilities [vnf=[vnf-1, vnf-2], vfModule=[vf-module-1], vm=[], vnfc=[]]", capabilitiesData.toString());
-  }
-
-  @Test
-  public void should_handle_dependency_config() throws Exception {
-
-    Vnfcs vnfcs = new Vnfcs();
-    vnfcs.setVnfcType("some-type");
-    vnfcs.setResilience("some-resilence");
-    vnfcs.setMandatory("some-mandatory");
-    Map<String, List<Vnfcs>> input = new HashMap<>();
-    List<Vnfcs> list = new ArrayList<>();
-    list.add(vnfcs);
-    list.add(vnfcs);
-    input.put("vnfcs", list);
-
-    String jsonPayload = new ObjectMapper().writeValueAsString(input);
-
-    when(dbService.getDependencyInfo(ctx)).thenReturn(jsonPayload);
-
-    FlowControlNode flowControlNode = new FlowControlNode(null, dbService);
-    DependencyInfo dependencyInfo = flowControlNode.getDependencyInfo(ctx);
+    flowSequenceGenerator = mock(FlowSequenceGenerator.class);
 
-    Assert.assertEquals("DependencyInfo [vnfcs=[Vnfcs [vnfcType=some-type, mandatory=some-mandatory, resilience=some-resilence, parents=[]], Vnfcs [vnfcType=some-type, mandatory=some-mandatory, resilience=some-resilence, parents=[]]]]", dependencyInfo.toString());
+    flowControlNode = new FlowControlNode(dbService, flowSequenceGenerator);
   }
 }