Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / serialization / db / DbAliasTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java
index 27d14c9..77ee36c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java
@@ -19,8 +19,8 @@
  */
 package org.onap.aai.serialization.db;
 
-import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
+import org.janusgraph.core.JanusGraphFactory;
+import org.janusgraph.core.JanusGraph;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -36,8 +36,10 @@ import org.onap.aai.introspection.*;
 import org.onap.aai.parsers.query.QueryParser;
 import org.onap.aai.schema.enums.PropertyMetadata;
 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 org.onap.aai.setup.SchemaVersion;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
@@ -54,11 +56,12 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 @RunWith(value = Parameterized.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class DbAliasTest extends AAISetup {
 
-       private TitanGraph graph;
+       private JanusGraph graph;
 
-       private final Version version = Version.v9;
+       private SchemaVersion version;
        private final ModelType introspectorFactoryType = ModelType.MOXY;
        private final DBConnectionType type = DBConnectionType.REALTIME;
        private Loader loader;
@@ -70,15 +73,17 @@ public class DbAliasTest extends AAISetup {
        @Parameterized.Parameters(name = "QueryStyle.{0}")
        public static Collection<Object[]> data() {
                return Arrays.asList(new Object[][]{
-                               {QueryStyle.TRAVERSAL}
+                               {QueryStyle.TRAVERSAL},
+                               {QueryStyle.TRAVERSAL_URI}
                });
        }
 
        @Before
        public void setup() throws Exception {
-               graph = TitanFactory.build().set("storage.backend","inmemory").open();
-               loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version);
-               dbEngine = new TitanDBEngine(
+           version = schemaVersions.getDepthVersion();
+               graph = JanusGraphFactory.build().set("storage.backend","inmemory").open();
+               loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, version);
+               dbEngine = new JanusGraphDBEngine(
                                queryStyle,
                                type,
                                loader);