EdgeRules throws descriptive error on invalid rule

[aai/aai-common.git] / aai-core / src / test / java / org / openecomp / aai / serialization / tinkerpop / TreeBackedVertexTest.java

diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java
index 6b9a917..c444052 100644 (file)
--- a/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java
@@ -20,46 +20,42 @@
 
 package org.openecomp.aai.serialization.tinkerpop;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.*;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.Before;
 import org.junit.Ignore;
-
+import org.junit.Test;
+import org.openecomp.aai.serialization.db.EdgeProperty;
 import org.openecomp.aai.serialization.engines.query.GraphTraversalQueryEngine;
 
+import static org.junit.Assert.assertEquals;
+
 @Ignore
 public class TreeBackedVertexTest {
 
-       
-       private static Graph graph = TinkerGraph.open();
-       private static Object startKey = null;
-       private static Tree<Element> tree = null;
-       private static Tree<Element> treeDepth1 = null;
-       private static Tree<Element> treeDepth0NodeOnly = null;
-       @BeforeClass
-       public static void configure() {
+       private Graph graph = TinkerGraph.open();
+       private Object startKey = null;
+       private Tree<Element> tree = null;
+       private Tree<Element> treeDepth1 = null;
+       private Tree<Element> treeDepth0NodeOnly = null;
+
+       @Before
+       public void configure() {
                GraphTraversalSource g = graph.traversal();
                
                startKey = g.addV(T.label, "vserver").as("v1").property("test", "hello")
                                .addV(T.label, "vserver").as("v2")
-                               .addV(T.label, "interface").property("name", "interface 1").as("v7").addInE("hasChild", "v2").property("isParent", true)
-                               .addV(T.label, "pserver").property("name", "pserver 1").as("v4").addOutE("runsOn", "v1").property("isParent", false)
-                               .addV(T.label, "interface").property("name", "interface 2").as("v3").addInE("hasChild", "v1").property("isParent", true)
-                               .addV(T.label, "address").property("name", "address 1").addInE("hasChild", "v3").property("isParent", true)
-                               .addV(T.label, "address").property("name", "address 2").addInE("hasChild", "v3").property("isParent", true)
-                               .addV(T.label, "complex").property("name", "complex 1").addInE("locatedIn", "v4").property("isParent", false)
-                               .addV(T.label, "interface").property("name", "interface 3").addInE("hasChild", "v4").property("isParent", true)
-                               .addV(T.label, "subnet").property("name", "subnet 1").as("v5").addInE("in", "v3").property("isParent", false)
-                               .addV(T.label, "address").property("name", "address 3").as("v6").addInE("hasChild", "v5").property("isParent", true)
+                               .addV(T.label, "interface").property("name", "interface 1").as("v7").addInE("hasChild", "v2").property(EdgeProperty.CONTAINS.toString(), true)
+                               .addV(T.label, "pserver").property("name", "pserver 1").as("v4").addOutE("runsOn", "v1").property(EdgeProperty.CONTAINS.toString(), false)
+                               .addV(T.label, "interface").property("name", "interface 2").as("v3").addInE("hasChild", "v1").property(EdgeProperty.CONTAINS.toString(), true)
+                               .addV(T.label, "address").property("name", "address 1").addInE("hasChild", "v3").property(EdgeProperty.CONTAINS.toString(), true)
+                               .addV(T.label, "address").property("name", "address 2").addInE("hasChild", "v3").property(EdgeProperty.CONTAINS.toString(), true)
+                               .addV(T.label, "complex").property("name", "complex 1").addInE("locatedIn", "v4").property(EdgeProperty.CONTAINS.toString(), false)
+                               .addV(T.label, "interface").property("name", "interface 3").addInE("hasChild", "v4").property(EdgeProperty.CONTAINS.toString(), true)
+                               .addV(T.label, "subnet").property("name", "subnet 1").as("v5").addInE("in", "v3").property(EdgeProperty.CONTAINS.toString(), false)
+                               .addV(T.label, "address").property("name", "address 3").as("v6").addInE("hasChild", "v5").property(EdgeProperty.CONTAINS.toString(), true)
                                .select("v1").next();
                
                tree = new GraphTraversalQueryEngine(g).findSubGraph((Vertex)startKey);