Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / query / builder / UntilTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
index d87eb67..cb67500 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.query.builder;
 
@@ -32,23 +30,29 @@ import org.onap.aai.AAISetup;
 import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Loader;
-import org.onap.aai.introspection.LoaderFactory;
 import org.onap.aai.introspection.ModelType;
-import org.onap.aai.serialization.db.EdgeRules;
-import org.onap.aai.serialization.db.EdgeType;
+
+import org.onap.aai.serialization.db.EdgeSerializer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.onap.aai.edges.enums.EdgeType;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertTrue;
 
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class UntilTest extends AAISetup {
 
        private Loader loader;
        
+       @Autowired
+       EdgeSerializer edgeSer;
+       
        @Before
        public void setup() throws Exception {
-               loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, AAIProperties.LATEST);
+               loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion());
        }
        
        private QueryBuilder<Vertex> buildTestQuery(QueryBuilder<Vertex> qb) throws AAIException{
@@ -63,16 +67,15 @@ public class UntilTest extends AAISetup {
        @Test
        public void gremlinQueryUntilTest() throws AAIException {
                Graph graph = TinkerGraph.open();
-               EdgeRules rules = EdgeRules.getInstance();
                GraphTraversalSource g = graph.traversal();
                
                Vertex v1 = graph.addVertex(T.id, 1, "aai-node-type", "cloud-region");
                Vertex v2 = graph.addVertex(T.id, 2, "aai-node-type", "tenant");
                Vertex v3 = graph.addVertex(T.id, 3, "aai-node-type", "vserver");
                Vertex v4 = graph.addVertex(T.id, 4, "aai-node-type", "l-interface");
-               rules.addTreeEdge(g, v1, v2);
-               rules.addTreeEdge(g, v2, v3);
-               rules.addTreeEdge(g, v3, v4);
+               edgeSer.addTreeEdge(g, v1, v2);
+               edgeSer.addTreeEdge(g, v2, v3);
+               edgeSer.addTreeEdge(g, v3, v4);
                List<Vertex> expected = new ArrayList<>();
                expected.add(v4);
                
@@ -87,16 +90,15 @@ public class UntilTest extends AAISetup {
        @Test
        public void traversalQueryUntilTest() throws AAIException {
                Graph graph = TinkerGraph.open();
-               EdgeRules rules = EdgeRules.getInstance();
                GraphTraversalSource g = graph.traversal();
                
                Vertex v1 = graph.addVertex(T.id, 1, "aai-node-type", "cloud-region");
                Vertex v2 = graph.addVertex(T.id, 2, "aai-node-type", "tenant");
                Vertex v3 = graph.addVertex(T.id, 3, "aai-node-type", "vserver");
                Vertex v4 = graph.addVertex(T.id, 4, "aai-node-type", "l-interface");
-               rules.addTreeEdge(g, v1, v2);
-               rules.addTreeEdge(g, v2, v3);
-               rules.addTreeEdge(g, v3, v4);
+               edgeSer.addTreeEdge(g, v1, v2);
+               edgeSer.addTreeEdge(g, v2, v3);
+               edgeSer.addTreeEdge(g, v3, v4);
                List<Vertex> expected = new ArrayList<>();
                expected.add(v4);