X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fquery%2Fbuilder%2FTraversalQueryTest.java;h=1eeca6f0b048e4b167e295e9897ec68a29082357;hb=f1a8fb1bc04f5d685f2b31d35db605f6fa054f60;hp=d5a0e4abf050fc1cb6a7c15d24f5b7402a131272;hpb=b1264ad4012f67664d71982a0eaad7e9bcce34f4;p=aai%2Faai-common.git diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java index d5a0e4ab..1eeca6f0 100644 --- a/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java +++ b/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java @@ -19,16 +19,9 @@ */ package org.onap.aai.query.builder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; +import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Test; @@ -36,63 +29,86 @@ import org.onap.aai.db.props.AAIProperties; import org.onap.aai.exceptions.AAIException; import org.onap.aai.serialization.db.EdgeType; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class TraversalQueryTest extends QueryBuilderTestAbstraction { @Override - protected QueryBuilder getNewEdgeTraversal(Vertex v) { + protected QueryBuilder getNewEdgeTraversalWithTestEdgeRules(Vertex v) { return new TraversalQuery<>(loader, g, v, testEdgeRules); } @Override - protected QueryBuilder getNewEdgeTraversal() { + protected QueryBuilder getNewEdgeTraversalWithTestEdgeRules() { return new TraversalQuery<>(loader, g, testEdgeRules); } @Override - protected QueryBuilder getNewVertexTraversal(Vertex v) { + protected QueryBuilder getNewVertexTraversalWithTestEdgeRules(Vertex v) { return new TraversalQuery<>(loader, g, v, testEdgeRules); } @Override + protected QueryBuilder getNewVertexTraversalWithTestEdgeRules() { + return new TraversalQuery<>(loader, g, testEdgeRules); + } + + protected QueryBuilder getNewVertexTraversal() { + return new TraversalQuery<>(loader, g); + } + + @Override + protected QueryBuilder getNewTreeTraversalWithTestEdgeRules(Vertex v) { + return new TraversalQuery<>(loader, g, v, testEdgeRules); + } + + @Override + protected QueryBuilder getNewTreeTraversalWithTestEdgeRules() { return new TraversalQuery<>(loader, g, testEdgeRules); } @Test public void unionQuery() { - QueryBuilder tQ = new TraversalQuery<>(loader, g); - QueryBuilder tQ2 = new TraversalQuery<>(loader, g); - QueryBuilder tQ3 = new TraversalQuery<>(loader, g); + QueryBuilder tQ = getNewVertexTraversal(); + QueryBuilder tQ2 = getNewVertexTraversal(); + QueryBuilder tQ3 = getNewVertexTraversal(); tQ.union( tQ2.getVerticesByProperty("test1", "value1"), tQ3.getVerticesByIndexedProperty("test2", "value2")); - + GraphTraversal expected = __.start() .union(__.has("test1", "value1"),__.has("test2", "value2")); - + assertEquals("they are equal", expected, tQ.getQuery()); - + } @Test public void traversalClones() throws UnsupportedEncodingException, AAIException, URISyntaxException { - QueryBuilder tQ = new TraversalQuery<>(loader, g); + QueryBuilder tQ = getNewVertexTraversal(); QueryBuilder builder = tQ.createQueryFromURI(new URI("network/generic-vnfs/generic-vnf/key1")).getQueryBuilder(); GraphTraversal expected = __.start().has("vnf-id", "key1").has("aai-node-type", "generic-vnf"); GraphTraversal containerExpected = __.start().has("aai-node-type", "generic-vnf"); - + assertEquals("query object", expected.toString(), builder.getQuery().toString()); assertEquals("container query object", containerExpected.toString(), builder.getContainerQuery().getQuery().toString()); - + } @Test public void nestedTraversalClones() throws UnsupportedEncodingException, AAIException, URISyntaxException { - - QueryBuilder tQ = new TraversalQuery<>(loader, g); + + QueryBuilder tQ = getNewVertexTraversal(); QueryBuilder builder = tQ.createQueryFromURI(new URI("network/generic-vnfs/generic-vnf/key1/l-interfaces/l-interface/key2")).getQueryBuilder(); GraphTraversal expected = __.start() .has("vnf-id", "key1") @@ -119,7 +135,7 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { testEdgeRules.addEdge(g, gvnf, vnfc1); - QueryBuilder tQ = getNewVertexTraversal(gvnf); + QueryBuilder tQ = getNewVertexTraversalWithTestEdgeRules(gvnf); tQ.createEdgeTraversal(EdgeType.COUSIN, "vnf", "vnfc"); List list = tQ.toList(); @@ -138,10 +154,10 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { testEdgeRules.addEdge(g, vce, vnfc1); - QueryBuilder tQ1 = new TraversalQuery<>(loader, g, vce, testEdgeRules); + QueryBuilder tQ1 = getNewVertexTraversalWithTestEdgeRules(vce); tQ1.createEdgeTraversal(EdgeType.COUSIN, "vnf", "vnfc"); - QueryBuilder tQ2 = new TraversalQuery<>(loader, g, vnfc1, testEdgeRules); + QueryBuilder tQ2 = getNewVertexTraversalWithTestEdgeRules(vnfc1); tQ2.createEdgeTraversal(EdgeType.COUSIN, "vnfc", "vnf"); List list1 = tQ1.toList(); @@ -163,7 +179,7 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { testEdgeRules.addEdge(g, vce, pserver); - QueryBuilder tQ1 = new TraversalQuery<>(loader, g, vce, testEdgeRules); + QueryBuilder tQ1 = getNewVertexTraversalWithTestEdgeRules(vce); tQ1.createEdgeTraversal(EdgeType.COUSIN, "vnf", "pserver"); List list = tQ1.toList(); @@ -184,7 +200,7 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { testEdgeRules.addEdge(g, gvnf, vnfc1); testEdgeRules.addEdge(g, gvnf, vnfc2, "re-uses"); - QueryBuilder tQ = getNewVertexTraversal(gvnf); + QueryBuilder tQ = getNewVertexTraversalWithTestEdgeRules(gvnf); tQ.createEdgeTraversal(EdgeType.COUSIN, "vnf", "vnfc"); List list = tQ.toList(); @@ -205,7 +221,7 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { testEdgeRules.addEdge(g, gvnf, pserver); testEdgeRules.addEdge(g, gvnf, pserver, "generic-vnf-pserver-B"); - QueryBuilder tQ = getNewVertexTraversal(gvnf); + QueryBuilder tQ = getNewVertexTraversalWithTestEdgeRules(gvnf); tQ.createEdgeTraversal(EdgeType.COUSIN, "vnf", "pserver"); List list = tQ.toList(); @@ -225,7 +241,7 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { testEdgeRules.addEdge(g, gvnf, complex); testEdgeRules.addEdge(g, gvnf, complex, "complex-generic-vnf-B"); - QueryBuilder tQ = getNewVertexTraversal(gvnf); + QueryBuilder tQ = getNewVertexTraversalWithTestEdgeRules(gvnf); tQ.createEdgeTraversal(EdgeType.COUSIN, "vnf", "complex"); List list = tQ.toList(); @@ -235,7 +251,7 @@ public class TraversalQueryTest extends QueryBuilderTestAbstraction { } - - + + }