diff options
Diffstat (limited to 'catalog-dao/src/test/java/org/openecomp/sdc/be/dao')
-rw-r--r-- | catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/HealingPipelineDaoTest.java | 36 | ||||
-rw-r--r-- | catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphUtilsTest.java (renamed from catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java) | 10 | ||||
-rw-r--r-- | catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java | 6 | ||||
-rw-r--r-- | catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java (renamed from catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java) | 184 | ||||
-rw-r--r-- | catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoTest.java (renamed from catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoTest.java) | 52 |
5 files changed, 144 insertions, 144 deletions
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/HealingPipelineDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/HealingPipelineDaoTest.java index 83b68920b9..c0d9e4644c 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/HealingPipelineDaoTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/HealingPipelineDaoTest.java @@ -17,10 +17,10 @@ package org.openecomp.sdc.be.dao.cassandra; import com.google.common.collect.ImmutableListMultimap; -import com.thinkaurelius.titan.core.TitanVertex; -import com.thinkaurelius.titan.graphdb.relations.StandardVertexProperty; -import com.thinkaurelius.titan.graphdb.types.system.EmptyVertex; -import com.thinkaurelius.titan.graphdb.types.system.ImplicitKey; +import org.janusgraph.core.JanusGraphVertex; +import org.janusgraph.graphdb.relations.StandardVertexProperty; +import org.janusgraph.graphdb.types.system.EmptyVertex; +import org.janusgraph.graphdb.types.system.ImplicitKey; import java.util.HashMap; import org.junit.Test; import org.mockito.Mockito; @@ -85,7 +85,7 @@ public class HealingPipelineDaoTest { } @Test - public void testPipelineFilter3AttributesTitanVertex() { + public void testPipelineFilter3AttributesJanusGraphVertex() { // init data HealingPipelineDao healingPipelineDao = new HealingPipelineDao(); healingPipelineDao.setHealVersion(7); @@ -95,16 +95,16 @@ public class HealingPipelineDaoTest { assertEquals(2, healingPipelineDao.getHealersForVertex(GraphEdgeLabels.CAPABILITY.getProperty(), HealVersionBuilder.build(5)).size()); - TitanVertex titanVertex = Mockito.mock(TitanVertex.class); + JanusGraphVertex janusGraphVertex = Mockito.mock(JanusGraphVertex.class); final int version = 5; StandardVertexProperty vertexProperty = new StandardVertexProperty(1, ImplicitKey.ID, new EmptyVertex(), version, (byte) 1); - Mockito.when(titanVertex.property(GraphPropertyEnum.HEALING_VERSION.getProperty())).thenReturn(vertexProperty); + Mockito.when(janusGraphVertex.property(GraphPropertyEnum.HEALING_VERSION.getProperty())).thenReturn(vertexProperty); // perform test - Optional optional = healingPipelineDao.performGraphReadHealing(titanVertex, GraphEdgeLabels.CAPABILITY); + Optional optional = healingPipelineDao.performGraphReadHealing(janusGraphVertex, GraphEdgeLabels.CAPABILITY); assertTrue(optional.isPresent()); - final TitanVertex changedVertex = (TitanVertex) optional.get(); + final JanusGraphVertex changedVertex = (JanusGraphVertex) optional.get(); //validate result assertNotNull(changedVertex); @@ -112,7 +112,7 @@ public class HealingPipelineDaoTest { } @Test - public void testPipelineFilterGenericTitanDao() { + public void testPipelineFilterGenericJanusGraphDao() { // init data HealingPipelineDao healingPipelineDao = new HealingPipelineDao(); healingPipelineDao.setHealVersion(7); @@ -140,7 +140,7 @@ public class HealingPipelineDaoTest { } @Test - public void testPipelineFilterTitanGraph1Attributes() { + public void testPipelineFilterJanusGraph1Attributes() { // init data HealingPipelineDao healingPipelineDao = new HealingPipelineDao(); healingPipelineDao.setHealVersion(7); @@ -217,9 +217,9 @@ public class HealingPipelineDaoTest { .put(GraphEdgeLabels.ATTRIBUTE.getProperty(), new GraphNodeHealTestMock(4)) .put(GraphEdgeLabels.ATTRIBUTE.getProperty(), new GraphNodeHealTestMock(5)) .put(GraphEdgeLabels.ATTRIBUTE.getProperty(), new GraphNodeHealTestMock(6)) - .put(GraphEdgeLabels.CAPABILITY.getProperty(), new TitanVertexHealTestMock(4)) - .put(GraphEdgeLabels.CAPABILITY.getProperty(), new TitanVertexHealTestMock(5)) - .put(GraphEdgeLabels.CAPABILITY.getProperty(), new TitanVertexHealTestMock(6)).build(); + .put(GraphEdgeLabels.CAPABILITY.getProperty(), new JanusGraphVertexHealTestMock(4)) + .put(GraphEdgeLabels.CAPABILITY.getProperty(), new JanusGraphVertexHealTestMock(5)) + .put(GraphEdgeLabels.CAPABILITY.getProperty(), new JanusGraphVertexHealTestMock(6)).build(); } public GraphEdge createGraphEdge(GraphEdgeLabels graphEdgeLabels){ @@ -247,7 +247,7 @@ public class HealingPipelineDaoTest { } - private class GraphNodeHealTestMock extends AbstractTitanVertexHeal { + private class GraphNodeHealTestMock extends AbstractJanusGraphVertexHeal { private HealVersion healVersion; public GraphNodeHealTestMock(int i) { @@ -266,10 +266,10 @@ public class HealingPipelineDaoTest { } - private class TitanVertexHealTestMock implements Heal<TitanVertex> { + private class JanusGraphVertexHealTestMock implements Heal<JanusGraphVertex> { private HealVersion healVersion; - public TitanVertexHealTestMock(int i) { + public JanusGraphVertexHealTestMock(int i) { healVersion = HealVersionBuilder.build(i); } @@ -279,7 +279,7 @@ public class HealingPipelineDaoTest { } @Override - public void healData(TitanVertex parentV) { + public void healData(JanusGraphVertex parentV) { } } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphUtilsTest.java index 641eec5773..b3fd59e8b6 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphUtilsTest.java @@ -1,21 +1,21 @@ -package org.openecomp.sdc.be.dao.titan; +package org.openecomp.sdc.be.dao.janusgraph; -import com.thinkaurelius.titan.graphdb.query.TitanPredicate; +import org.janusgraph.graphdb.query.JanusGraphPredicate; import org.apache.tinkerpop.gremlin.structure.T; import org.junit.Test; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -public class TitanUtilsTest { +public class JanusGraphUtilsTest { @Test public void testBuildNotInPredicate() throws Exception { String propKey = ""; Collection<T> notInCollection = null; - Map<String, Entry<TitanPredicate, Object>> result; + Map<String, Entry<JanusGraphPredicate, Object>> result; // default test - result = TitanUtils.buildNotInPredicate(propKey, notInCollection); + result = JanusGraphUtils.buildNotInPredicate(propKey, notInCollection); } }
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java index b336bc65e9..8ce20191fd 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertexTest.java @@ -1,6 +1,6 @@ package org.openecomp.sdc.be.dao.jsongraph; -import com.thinkaurelius.titan.core.TitanVertex; +import org.janusgraph.core.JanusGraphVertex; import org.junit.Test; import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; @@ -70,7 +70,7 @@ public class GraphVertexTest { @Test public void testGetVertex() throws Exception { GraphVertex testSubject; - TitanVertex result; + JanusGraphVertex result; // default test testSubject = createTestSubject(); @@ -81,7 +81,7 @@ public class GraphVertexTest { @Test public void testSetVertex() throws Exception { GraphVertex testSubject; - TitanVertex vertex = null; + JanusGraphVertex vertex = null; // default test testSubject = createTestSubject(); diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/JanusGraphDaoMockTest.java index 5703e53c9c..72a9d54336 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/TitanDaoMockTest.java +++ b/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 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 index 2c4b868ff2..9019de9d24 100644 --- 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 |