Upgrade SDC from Titan to Janus Graph
[sdc.git] / catalog-dao / src / test / java / org / openecomp / sdc / be / dao / jsongraph / JanusGraphDaoMockTest.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.be.dao.jsongraph;
 
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanVertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
 import mockit.Deencapsulation;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -15,12 +15,12 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgePropertyEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanGraphClient;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 
 import java.util.HashMap;
@@ -28,13 +28,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-public class TitanDaoMockTest {
+public class JanusGraphDaoMockTest {
 
        @InjectMocks
-       TitanDao testSubject;
+       JanusGraphDao testSubject;
 
        @Mock
-       TitanGraphClient titanClient;
+       JanusGraphClient janusGraphClient;
 
        @Before
        public void setUp() throws Exception {
@@ -43,7 +43,7 @@ public class TitanDaoMockTest {
 
        @Test
        public void testCommit() throws Exception {
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
                result = testSubject.commit();
@@ -51,7 +51,7 @@ public class TitanDaoMockTest {
 
        @Test
        public void testRollback() throws Exception {
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
                result = testSubject.rollback();
@@ -60,7 +60,7 @@ public class TitanDaoMockTest {
        @Test
        public void testGetGraph() throws Exception {
 
-               Either<TitanGraph, TitanOperationStatus> result;
+               Either<JanusGraph, JanusGraphOperationStatus> result;
 
                // default test
 
@@ -72,14 +72,14 @@ public class TitanDaoMockTest {
 
                GraphVertex graphVertex = new GraphVertex();
                graphVertex.setLabel(VertexTypeEnum.ADDITIONAL_INFORMATION);
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               TitanGraph tg = Mockito.mock(TitanGraph.class);
-               Either<TitanGraph, TitanOperationStatus> value = Either.left(tg);
+               JanusGraph tg = Mockito.mock(JanusGraph.class);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.left(tg);
                // default test
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
                Mockito.when(tg.addVertex()).thenReturn(value2);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                result = testSubject.createVertex(graphVertex);
        }
 
@@ -88,11 +88,11 @@ public class TitanDaoMockTest {
 
                GraphVertex graphVertex = new GraphVertex();
                graphVertex.setLabel(VertexTypeEnum.ADDITIONAL_INFORMATION);
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
                // default test
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                result = testSubject.createVertex(graphVertex);
        }
 
@@ -101,35 +101,35 @@ public class TitanDaoMockTest {
 
                GraphVertex graphVertex = new GraphVertex();
                graphVertex.setLabel(VertexTypeEnum.ADDITIONAL_INFORMATION);
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               TitanGraph tg = Mockito.mock(TitanGraph.class);
-               Either<TitanGraph, TitanOperationStatus> value = Either.left(tg);
+               JanusGraph tg = Mockito.mock(JanusGraph.class);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.left(tg);
                // default test
                Mockito.when(tg.addVertex()).thenThrow(RuntimeException.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                result = testSubject.createVertex(graphVertex);
        }
 
        @Test
        public void testGetVertexByPropertyAndLabel() throws Exception {
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
-               Mockito.when(titanClient.getGraph()).thenReturn(Either.right(TitanOperationStatus.GENERAL_ERROR));
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(Either.right(JanusGraphOperationStatus.GENERAL_ERROR));
                result = testSubject.getVertexByPropertyAndLabel(GraphPropertyEnum.COMPONENT_TYPE, "mock",
                                VertexTypeEnum.ADDITIONAL_INFORMATION);
        }
 
        @Test
        public void testGetFirstFoundVertex() throws Exception {
-               Iterable<TitanVertex> vertices = Mockito.mock(Iterable.class);
-               Either<GraphVertex, TitanOperationStatus> result;
+               Iterable<JanusGraphVertex> vertices = Mockito.mock(Iterable.class);
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               Iterator<TitanVertex> value = Mockito.mock(Iterator.class);
+               Iterator<JanusGraphVertex> value = Mockito.mock(Iterator.class);
                Mockito.when(vertices.iterator()).thenReturn(value);
                Mockito.when(value.hasNext()).thenReturn(true);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
                Mockito.when(value.next()).thenReturn(value2);
 
                // default test
@@ -138,13 +138,13 @@ public class TitanDaoMockTest {
 
        @Test
        public void testGetFirstFoundVertexNotFound() throws Exception {
-               Iterable<TitanVertex> vertices = Mockito.mock(Iterable.class);
-               Either<GraphVertex, TitanOperationStatus> result;
+               Iterable<JanusGraphVertex> vertices = Mockito.mock(Iterable.class);
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               Iterator<TitanVertex> value = Mockito.mock(Iterator.class);
+               Iterator<JanusGraphVertex> value = Mockito.mock(Iterator.class);
                Mockito.when(vertices.iterator()).thenReturn(value);
                Mockito.when(value.hasNext()).thenReturn(false);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
                Mockito.when(value.next()).thenReturn(value2);
 
                // default test
@@ -155,14 +155,14 @@ public class TitanDaoMockTest {
        public void testGetVertexById_1Exception() throws Exception {
 
                String id = "mock";
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               TitanGraph tg = Mockito.mock(TitanGraph.class);
-               Either<TitanGraph, TitanOperationStatus> value = Either.left(tg);
+               JanusGraph tg = Mockito.mock(JanusGraph.class);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.left(tg);
                // default test
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
                Mockito.when(tg.addVertex()).thenReturn(value2);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
 
                // test 1
                result = testSubject.getVertexById(id, JsonParseFlagEnum.NoParse);
@@ -173,13 +173,13 @@ public class TitanDaoMockTest {
        public void testGetVertexById_1GraphClosed() throws Exception {
 
                String id = "mock";
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                Object b;
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
                // default test
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
 
                // test 1
                result = testSubject.getVertexById(id, JsonParseFlagEnum.NoParse);
@@ -199,7 +199,7 @@ public class TitanDaoMockTest {
        @Test
        public void testCreateAndFill() throws Exception {
 
-               TitanVertex vertex = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex vertex = Mockito.mock(JanusGraphVertex.class);
                JsonParseFlagEnum parseFlag = null;
                GraphVertex result;
 
@@ -212,7 +212,7 @@ public class TitanDaoMockTest {
        public void testParseVertexProperties() throws Exception {
 
                GraphVertex graphVertex = new GraphVertex();
-               TitanVertex vertex = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex vertex = Mockito.mock(JanusGraphVertex.class);
                graphVertex.setVertex(vertex);
                JsonParseFlagEnum parseFlag = null;
 
@@ -228,11 +228,11 @@ public class TitanDaoMockTest {
                GraphVertex from = Mockito.mock(GraphVertex.class);
                GraphVertex to = Mockito.mock(GraphVertex.class);
                
-               TitanVertex value = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value = Mockito.mock(JanusGraphVertex.class);
                Mockito.when(from.getVertex()).thenReturn(value);
                Mockito.when(to.getVertex()).thenReturn(value);
                Map<EdgePropertyEnum, Object> properties = new HashMap<>();
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
 
@@ -257,13 +257,13 @@ public class TitanDaoMockTest {
        @Test
        public void testGetByCriteria() throws Exception {
                Map<GraphPropertyEnum, Object> props = new HashMap<>();
-               Either<List<GraphVertex>, TitanOperationStatus> result;
+               Either<List<GraphVertex>, JanusGraphOperationStatus> result;
 
-               TitanGraph tg = Mockito.mock(TitanGraph.class);
-               Either<TitanGraph, TitanOperationStatus> value = Either.left(tg);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
+               JanusGraph tg = Mockito.mock(JanusGraph.class);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.left(tg);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
                Mockito.when(tg.addVertex()).thenReturn(value2);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                
                // default test
                result = testSubject.getByCriteria(VertexTypeEnum.ADDITIONAL_INFORMATION, props);
@@ -273,11 +273,11 @@ public class TitanDaoMockTest {
        public void testGetByCriteria_1() throws Exception {
 
                Map<GraphPropertyEnum, Object> props = new HashMap<>();
-               Either<List<GraphVertex>, TitanOperationStatus> result;
+               Either<List<GraphVertex>, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
 
                // default test
                result = testSubject.getByCriteria(VertexTypeEnum.ADDITIONAL_INFORMATION, props, JsonParseFlagEnum.NoParse);
@@ -285,12 +285,12 @@ public class TitanDaoMockTest {
 
        @Test
        public void testGetCatalogVerticies() throws Exception {
-               Either<Iterator<Vertex>, TitanOperationStatus> result;
+               Either<Iterator<Vertex>, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
                // default test
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                
                // default test
                result = testSubject.getCatalogOrArchiveVerticies(true);
@@ -302,11 +302,11 @@ public class TitanDaoMockTest {
                GraphVertex parentVertex = new GraphVertex();
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                
                // default test
                result = testSubject.getChildVertex(parentVertex, EdgeLabelEnum.ADDITIONAL_INFORMATION, JsonParseFlagEnum.NoParse);
@@ -318,11 +318,11 @@ public class TitanDaoMockTest {
                Vertex parentVertex = null;
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<Vertex, TitanOperationStatus> result;
+               Either<Vertex, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
 
                // default test
                result = testSubject.getChildVertex(parentVertex, edgeLabel, parseFlag);
@@ -335,7 +335,7 @@ public class TitanDaoMockTest {
                Vertex parentVertex = null;
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<Vertex, TitanOperationStatus> result;
+               Either<Vertex, JanusGraphOperationStatus> result;
 
                // default test
 
@@ -348,7 +348,7 @@ public class TitanDaoMockTest {
                Vertex parentVertex = null;
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<List<Vertex>, TitanOperationStatus> result;
+               Either<List<Vertex>, JanusGraphOperationStatus> result;
 
                // default test
 
@@ -362,11 +362,11 @@ public class TitanDaoMockTest {
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
                Direction direction = null;
-               Either<List<Vertex>, TitanOperationStatus> result;
+               Either<List<Vertex>, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                // default test
                result = Deencapsulation.invoke(testSubject, "getAdjacentVerticies",
                                new Object[] { Vertex.class, EdgeLabelEnum.class, JsonParseFlagEnum.class, Direction.class });
@@ -378,7 +378,7 @@ public class TitanDaoMockTest {
                Vertex parentVertex = null;
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<List<Vertex>, TitanOperationStatus> result;
+               Either<List<Vertex>, JanusGraphOperationStatus> result;
 
                // default test
 
@@ -392,7 +392,7 @@ public class TitanDaoMockTest {
                GraphVertex vertex = null;
                EdgeLabelEnum label = null;
                Map<GraphPropertyEnum, Object> properties = null;
-               Either<Edge, TitanOperationStatus> result;
+               Either<Edge, JanusGraphOperationStatus> result;
 
                // default test
 
@@ -404,11 +404,11 @@ public class TitanDaoMockTest {
 
                GraphVertex fromVertex = new GraphVertex();
                GraphVertex toVertex = new GraphVertex();
-               Either<Edge, TitanOperationStatus> result;
+               Either<Edge, JanusGraphOperationStatus> result;
 
-               Either<TitanGraph, TitanOperationStatus> value = Either.right(TitanOperationStatus.GENERAL_ERROR);
-               TitanVertex value2 = Mockito.mock(TitanVertex.class);
-               Mockito.when(titanClient.getGraph()).thenReturn(value);
+               Either<JanusGraph, JanusGraphOperationStatus> value = Either.right(JanusGraphOperationStatus.GENERAL_ERROR);
+               JanusGraphVertex value2 = Mockito.mock(JanusGraphVertex.class);
+               Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
                
                // default test
                result = testSubject.deleteEdge(fromVertex, toVertex, EdgeLabelEnum.ADDITIONAL_INFORMATION);
@@ -417,7 +417,7 @@ public class TitanDaoMockTest {
        @Test
        public void testDeleteEdgeByDirection() throws Exception {
                GraphVertex fromVertex = new GraphVertex();
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
                result = testSubject.deleteEdgeByDirection(fromVertex, Direction.BOTH, EdgeLabelEnum.ADDITIONAL_INFORMATION);
@@ -426,9 +426,9 @@ public class TitanDaoMockTest {
        @Test
        public void testDeleteEdgeByDirectionMock() throws Exception {
                GraphVertex fromVertex = Mockito.mock(GraphVertex.class);
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
-               TitanVertex value = Mockito.mock(TitanVertex.class);;
+               JanusGraphVertex value = Mockito.mock(JanusGraphVertex.class);;
                Mockito.when(fromVertex.getVertex()).thenReturn(value);
                Iterator<Edge> value2 = Mockito.mock(Iterator.class);;
                Mockito.when(value.edges(Mockito.any(), Mockito.any())).thenReturn(value2);
@@ -443,7 +443,7 @@ public class TitanDaoMockTest {
        public void testUpdateVertex() throws Exception {
 
                GraphVertex graphVertex = new GraphVertex();
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
 
@@ -454,7 +454,7 @@ public class TitanDaoMockTest {
        public void testGetVerticesByUniqueIdAndParseFlag() throws Exception {
 
                Map<String, ImmutablePair<GraphPropertyEnum, JsonParseFlagEnum>> verticesToGet = new HashMap<>();
-               Either<Map<String, GraphVertex>, TitanOperationStatus> result;
+               Either<Map<String, GraphVertex>, JanusGraphOperationStatus> result;
                
                // default test
                result = testSubject.getVerticesByUniqueIdAndParseFlag(verticesToGet);
@@ -475,7 +475,7 @@ public class TitanDaoMockTest {
                Vertex to = null;
                EdgeLabelEnum label = null;
                Edge edgeToCopy = null;
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
 
@@ -491,7 +491,7 @@ public class TitanDaoMockTest {
                Edge prevEdge = null;
                EdgeLabelEnum prevLabel = null;
                EdgeLabelEnum newLabel = null;
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
 
@@ -504,7 +504,7 @@ public class TitanDaoMockTest {
                Vertex vertex = Mockito.mock(Vertex.class);;
                Map<GraphPropertyEnum, Object> properties = new HashMap<>();
                properties.put(GraphPropertyEnum.COMPONENT_TYPE, "mock");
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
 
@@ -516,9 +516,9 @@ public class TitanDaoMockTest {
        public void testDisassociateAndDeleteLast() throws Exception {
 
                GraphVertex vertex = Mockito.mock(GraphVertex.class);
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
                
-               TitanVertex value = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value = Mockito.mock(JanusGraphVertex.class);
                Iterator<Edge> mockiter = Mockito.mock(Iterator.class);
                Edge nextmock = Mockito.mock(Edge.class);
                Mockito.when(vertex.getVertex()).thenReturn(value);
@@ -540,9 +540,9 @@ public class TitanDaoMockTest {
        public void testDisassociateAndDeleteLastOut() throws Exception {
 
                GraphVertex vertex = Mockito.mock(GraphVertex.class);
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
                
-               TitanVertex value = Mockito.mock(TitanVertex.class);
+               JanusGraphVertex value = Mockito.mock(JanusGraphVertex.class);
                Iterator<Edge> mockiter = Mockito.mock(Iterator.class);
                Edge nextmock = Mockito.mock(Edge.class);
                Mockito.when(vertex.getVertex()).thenReturn(value);
@@ -564,7 +564,7 @@ public class TitanDaoMockTest {
        public void testDisassociateAndDeleteLastException() throws Exception {
 
                GraphVertex vertex = Mockito.mock(GraphVertex.class);
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
                
                Mockito.when(vertex.getVertex()).thenThrow(RuntimeException.class);
                
@@ -577,7 +577,7 @@ public class TitanDaoMockTest {
 
                GraphVertex vertexA = new GraphVertex();
                GraphVertex vertexB = new GraphVertex();
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test