Upgrade SDC from Titan to Janus Graph

[sdc.git] / catalog-dao / src / test / java / org / openecomp / sdc / be / dao / jsongraph / JanusGraphDaoTest.java

diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java
similarity index 80%
rename from catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java
rename to catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java
index 2c4b868..9019de9 100644 (file)
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java
@@ -1,6 +1,6 @@
 package org.openecomp.sdc.be.dao.jsongraph;
 
-import com.thinkaurelius.titan.core.TitanGraph;
+import org.janusgraph.core.JanusGraph;
 import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
@@ -10,13 +10,13 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sdc.be.dao.DAOTitanStrategy;
+import org.openecomp.sdc.be.dao.DAOJanusGraphStrategy;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
+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.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.utils.DAOConfDependentTest;
 import org.slf4j.Logger;
@@ -26,25 +26,25 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-public class TitanDaoTest extends DAOConfDependentTest{
+public class JanusGraphDaoTest extends DAOConfDependentTest{
        
        
-       private static Logger logger = LoggerFactory.getLogger(TitanDaoTest.class);
-       private TitanDao dao = new TitanDao(new TitanGraphClient(new DAOTitanStrategy()));
+       private static Logger logger = LoggerFactory.getLogger(JanusGraphDaoTest.class);
+       private JanusGraphDao dao = new JanusGraphDao(new JanusGraphClient(new DAOJanusGraphStrategy()));
        
        @Before
        public void init(){
-       dao.titanClient.createGraph();
+       dao.janusGraphClient.createGraph();
        }
        
        @After
        public void end(){
-               dao.titanClient.cleanupGraph();
+               dao.janusGraphClient.cleanupGraph();
        }
 
        @Test
        public void testCreateVertex() throws Exception {
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
                GraphVertex graphVertex = new GraphVertex(VertexTypeEnum.REQUIREMENTS);
@@ -56,7 +56,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
        
        @Test
        public void testGetVertexByLabel() throws Exception {
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
                result = dao.getVertexByLabel(VertexTypeEnum.ADDITIONAL_INFORMATION);
@@ -64,7 +64,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
        
        @Test
        public void testCommit() throws Exception {
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
                
@@ -75,7 +75,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
        @Test
        public void testRollback() throws Exception {
                
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
                
@@ -85,7 +85,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
        @Test
        public void testGetGraph() throws Exception {
                
-               Either<TitanGraph, TitanOperationStatus> result;
+               Either<JanusGraph, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -98,7 +98,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                GraphPropertyEnum name = null;
                Object value = null;
                VertexTypeEnum label = null;
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -114,7 +114,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                Object value = null;
                VertexTypeEnum label = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -126,7 +126,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
        public void testGetVertexById() throws Exception {
                
                String id = "";
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -138,7 +138,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                
                String id = "";
                JsonParseFlagEnum parseFlag = null;
-               Either<GraphVertex, TitanOperationStatus> result;
+               Either<GraphVertex, JanusGraphOperationStatus> result;
 
                // test 1
                
@@ -181,7 +181,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                
                VertexTypeEnum type = null;
                Map<GraphPropertyEnum, Object> props = null;
-               Either<List<GraphVertex>, TitanOperationStatus> result;
+               Either<List<GraphVertex>, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -194,7 +194,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                VertexTypeEnum type = null;
                Map<GraphPropertyEnum, Object> props = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<List<GraphVertex>, TitanOperationStatus> result;
+               Either<List<GraphVertex>, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -209,7 +209,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                Map<GraphPropertyEnum, Object> props = null;
                Map<GraphPropertyEnum, Object> hasNotProps = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<List<GraphVertex>, TitanOperationStatus> result;
+               Either<List<GraphVertex>, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -219,7 +219,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
        @Test
        public void testGetCatalogVerticies() throws Exception {
                
-               Either<Iterator<Vertex>, TitanOperationStatus> result;
+               Either<Iterator<Vertex>, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -232,7 +232,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                Vertex parentVertex = null;
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<List<Vertex>, TitanOperationStatus> result;
+               Either<List<Vertex>, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -245,7 +245,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                Vertex parentVertex = null;
                EdgeLabelEnum edgeLabel = null;
                JsonParseFlagEnum parseFlag = null;
-               Either<List<Vertex>, TitanOperationStatus> result;
+               Either<List<Vertex>, JanusGraphOperationStatus> result;
 
                // default test
                
@@ -257,7 +257,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                
                Vertex vertex = null;
                Map<GraphPropertyEnum, Object> properties = null;
-               TitanOperationStatus result;
+               JanusGraphOperationStatus result;
 
                // default test
                
@@ -303,7 +303,7 @@ public class TitanDaoTest extends DAOConfDependentTest{
                String parentId = "";
                EdgeLabelEnum label = null;
                Map<GraphPropertyEnum, Object> properties = null;
-               Either<Edge, TitanOperationStatus> result;
+               Either<Edge, JanusGraphOperationStatus> result;
 
                // default test