Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / parsers / query / GraphTraversalTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java
index 02e9efa..d452b00 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java
@@ -32,12 +32,10 @@ import org.junit.runners.Parameterized;
 import org.onap.aai.AAISetup;
 import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.exceptions.AAIException;
-import org.onap.aai.introspection.LoaderFactory;
 import org.onap.aai.introspection.ModelType;
-import org.onap.aai.introspection.Version;
 import org.onap.aai.rest.RestTokens;
 import org.onap.aai.serialization.engines.QueryStyle;
-import org.onap.aai.serialization.engines.TitanDBEngine;
+import org.onap.aai.serialization.engines.JanusGraphDBEngine;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 
 import javax.ws.rs.core.MultivaluedHashMap;
@@ -67,12 +65,14 @@ public class GraphTraversalTest extends AAISetup {
        @Parameterized.Parameters(name = "QueryStyle.{0}")
        public static Collection<Object[]> data() {
                return Arrays.asList(new Object[][]{
-                               {QueryStyle.TRAVERSAL}
+                               {QueryStyle.TRAVERSAL},
+                               {QueryStyle.TRAVERSAL_URI}
                });
        }
 
        @Rule public ExpectedException thrown = ExpectedException.none();
        
+       
        /**
         * Configure.
         * @throws Exception 
@@ -82,13 +82,13 @@ public class GraphTraversalTest extends AAISetup {
        @Before
        public void configure() throws Exception {
                dbEngine =
-                               new TitanDBEngine(queryStyle,
-                                       LoaderFactory.createLoaderForVersion(ModelType.MOXY, AAIProperties.LATEST),
+                               new JanusGraphDBEngine(queryStyle,
+                                       loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion()),
                                        false);
                
                dbEnginev9 = 
-                               new TitanDBEngine(queryStyle,
-                                       LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v9),
+                               new JanusGraphDBEngine(queryStyle,
+                                       loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion()),
                                        false);
        }