Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Upgrade SDC from Titan to Janus Graph
[sdc.git] / catalog-model / src / test / java / org / openecomp / sdc / be / model / jsonjanusgraph / operations / NodeTemplateOperationTest.java
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationTest.java
similarity index 84%
rename from catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationTest.java
rename to catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationTest.java
index bddebea..1455d1e 100644 (file)
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationTest.java
@@ -27,7 +27,7 @@
  * limitations under the License.
 
  */
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import com.google.common.collect.Lists;
 import fj.data.Either;
@@ -40,17 +40,17 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.*;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.datatypes.elements.MapListCapabilityDataDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 
@@ -91,7 +91,7 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     private static NodeTemplateOperation operation;
 
     @Mock
-    private static TitanDao titanDao;
+    private static JanusGraphDao janusGraphDao;
 
     @Mock
     private static TopologyTemplateOperation topologyTemplateOperation;
@@ -99,9 +99,9 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @BeforeClass
     public static void setup() {
         init();
-        titanDao = Mockito.mock(TitanDao.class);
+        janusGraphDao = Mockito.mock(JanusGraphDao.class);
         operation = new NodeTemplateOperation();
-        operation.setTitanDao(titanDao);
+        operation.setJanusGraphDao(janusGraphDao);
         buildDataDefinition();
     }
 
@@ -114,13 +114,13 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledCapabilityByRelationSuccess(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
         GraphVertex dataVertex = new GraphVertex();
         dataVertex.setJson(fulfilledCapability);
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.left(dataVertex);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.left(dataVertex);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<CapabilityDataDefinition, StorageOperationStatus> result = operation.getFulfilledCapabilityByRelation(COMPONENT_ID, TO_INSTANCE_ID, relation, this::isBelongingCapability);
         assertTrue(result.isLeft());
         assertEquals(result.left().value(), capability);
@@ -129,13 +129,13 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledRequirementByRelationSuccess(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
         GraphVertex dataVertex = new GraphVertex();
         dataVertex.setJson(fulfilledRequirement);
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.left(dataVertex);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.left(dataVertex);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<RequirementDataDefinition, StorageOperationStatus> result = operation.getFulfilledRequirementByRelation(COMPONENT_ID, FROM_INSTANCE_ID, relation, this::isBelongingRequirement);
         assertTrue(result.isLeft());
         assertEquals(result.left().value(), requirement);
@@ -144,11 +144,12 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledCapabilityByRelationNotFoundFailure(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.right(TitanOperationStatus.NOT_FOUND);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.right(
+            JanusGraphOperationStatus.NOT_FOUND);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_CAPABILITIES), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<CapabilityDataDefinition, StorageOperationStatus> result = operation.getFulfilledCapabilityByRelation(COMPONENT_ID, TO_INSTANCE_ID, relation, this::isBelongingCapability);
         assertTrue(result.isRight());
         assertSame(result.right().value(), StorageOperationStatus.NOT_FOUND);
@@ -157,11 +158,12 @@ public class NodeTemplateOperationTest extends ModelTestBase {
     @Test
     public void testGetFulfilledRequirementByRelationNotFoundFailure(){
         GraphVertex vertex = Mockito.mock(GraphVertex.class);
-        Either<GraphVertex, TitanOperationStatus> vertexRes = Either.left(vertex);
-        when(titanDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> vertexRes = Either.left(vertex);
+        when(janusGraphDao.getVertexById(eq(COMPONENT_ID), eq(JsonParseFlagEnum.ParseAll))).thenReturn(vertexRes);
 
-        Either<GraphVertex, TitanOperationStatus> childVertexRes = Either.right(TitanOperationStatus.NOT_FOUND);
-        when(titanDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
+        Either<GraphVertex, JanusGraphOperationStatus> childVertexRes = Either.right(
+            JanusGraphOperationStatus.NOT_FOUND);
+        when(janusGraphDao.getChildVertex(eq(vertex), eq(EdgeLabelEnum.FULLFILLED_REQUIREMENTS), eq(JsonParseFlagEnum.ParseJson))).thenReturn(childVertexRes);
         Either<RequirementDataDefinition, StorageOperationStatus> result = operation.getFulfilledRequirementByRelation(COMPONENT_ID, FROM_INSTANCE_ID, relation, this::isBelongingRequirement);
         assertTrue(result.isRight());
         assertSame(result.right().value(), StorageOperationStatus.NOT_FOUND);
@@ -179,8 +181,8 @@ public class NodeTemplateOperationTest extends ModelTestBase {
         componentInstance.setComponentUid(id);
         container.setUniqueId(id);
         GraphVertex graphVertex = new GraphVertex();
-        when(titanDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertex));
-        when(titanDao.updateVertex(graphVertex)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDao.getVertexById(container.getUniqueId(), JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(graphVertex));
+        when(janusGraphDao.updateVertex(graphVertex)).thenReturn(Either.left(graphVertex));
         when(topologyTemplateOperation.getToscaElement(anyString())).thenReturn(Either.left(toscaElement));
 
         result = operation.updateComponentInstanceMetadataOfTopologyTemplate(container, toscaElement, componentInstance);
SDC Parent Project Catalog FE and BE