1 files changed, 27 insertions, 25 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/PathTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/PathTest.java
index a218b8bb41..0202faded6 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/PathTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/PathTest.java
@@ -1,16 +1,9 @@
 package org.openecomp.sdc.be.components;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.openecomp.sdc.be.auditing.impl.AuditingManager;
@@ -21,20 +14,15 @@ import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.ForwardingPathUtils;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.CapabilityRequirementRelationship;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.RelationshipImpl;
-import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.exception.ResponseFormat;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import java.io.IOException;
+import java.util.*;
 
-import fj.data.Either;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class PathTest extends BaseServiceBusinessLogicTest {
     public static final String fromNode = "fromNode";
@@ -44,10 +32,10 @@ public class PathTest extends BaseServiceBusinessLogicTest {
         Service service = super.createServiceObject(afterCreate);
         ArrayList<RequirementCapabilityRelDef> resourceInstancesRelations = new ArrayList<>();
         String toNode = "toNode";
-        resourceInstancesRelations.add(createRequirementCapabilityRelDef(fromNode, "1", toNode, "2", "capability", "3", "requirement", "4"));
+        resourceInstancesRelations.add(createRequirementCapabilityRelDef(fromNode, toNode));
         String fromNode1 = "fromNode1";
         String toNode1 = "toNode1";
-        resourceInstancesRelations.add(createRequirementCapabilityRelDef(fromNode1, "11", toNode1, "21", "capability1", "31", "requirement1", "41"));
+        resourceInstancesRelations.add(createRequirementCapabilityRelDef(fromNode1, toNode1));
         service.setComponentInstances(new java.util.ArrayList<>());
         service.getComponentInstances().add(getComponentInstance(fromNode, "fromNode"));
         service.getComponentInstances().add(getComponentInstance(fromNode1, "fromNode1"));
@@ -84,7 +72,7 @@ public class PathTest extends BaseServiceBusinessLogicTest {
     }
 
 
-    protected RequirementCapabilityRelDef createRequirementCapabilityRelDef(String fromNode, String fromNodeId, String toNode, String toNodeId, String capability, String capabilityId, String requirement, String requirementId) {
+    protected RequirementCapabilityRelDef createRequirementCapabilityRelDef(String fromNode, String toNode) {
         RequirementCapabilityRelDef requirementCapabilityRelDef = new RequirementCapabilityRelDef();
         requirementCapabilityRelDef.setFromNode(fromNode);
         requirementCapabilityRelDef.setRelationships(new ArrayList<>());
@@ -125,7 +113,7 @@ public class PathTest extends BaseServiceBusinessLogicTest {
         assertEquals(protocol, forwardingPathDataDefinition.getProtocol());
         List<ForwardingPathElementDataDefinition> listToscaDataDefinition = forwardingPathDataDefinition.getPathElements().getListToscaDataDefinition();
         assertEquals(3, listToscaDataDefinition.size());
-        assertTrue(listToscaDataDefinition.get(0).getFromNode().equals(nodeA));
+        assertEquals(listToscaDataDefinition.get(0).getFromNode(), nodeA);
     }
 
     @Test
@@ -142,4 +130,18 @@ public class PathTest extends BaseServiceBusinessLogicTest {
         System.out.println(" RESPONSE BODY: " + resultString);
         assertTrue(resultString.contains(fromNode));
     }
+
+    @Test
+    public void emptyCapabilitesShouldNotCauseFailure() {
+        Service serviceObject = createServiceObject(false);
+        ComponentInstance ci = new ComponentInstance();
+        ci.setCapabilities(null);
+        serviceObject.getComponentInstances().add(ci);
+        ServiceRelations serviceRelations = new ForwardingPathUtils().convertServiceToServiceRelations(
+            serviceObject);
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        String resultString = gson.toJson(serviceRelations);
+        System.out.println(" RESPONSE BODY: " + resultString);
+        assertTrue(resultString.contains(fromNode));
+    }
 }