Integrate aai-schema-ingest library into aai-core

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

diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java
index 1430b87..f7e239b 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java
@@ -31,6 +31,9 @@ import org.junit.Test;
 import org.onap.aai.AAISetup;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.*;
+import org.onap.aai.nodes.NodeIngestor;
+import org.onap.aai.setup.SchemaVersion;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.JanusGraphDBEngine;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
@@ -46,13 +49,12 @@ import static org.junit.Assert.assertEquals;
 @Ignore
 public class UniqueRelationshipQueryTest extends AAISetup {
 
-       private ModelInjestor injestor = ModelInjestor.getInstance();
-       private TransactionalGraphEngine dbEngine = 
-                       new JanusGraphDBEngine(QueryStyle.GREMLIN_UNIQUE, 
-                               LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8),
-                               false);
-       private final Version version = Version.v8;
-       private DynamicJAXBContext context = injestor.getContextForVersion(version);
+       @Autowired 
+       private NodeIngestor ingestor ;
+       
+       private TransactionalGraphEngine dbEngine;
+       private SchemaVersion version ;
+       private DynamicJAXBContext context = ingestor.getContextForVersion(version);
        private Unmarshaller unmarshaller = null;
        
        /**
@@ -62,6 +64,10 @@ public class UniqueRelationshipQueryTest extends AAISetup {
         */
        @Before
        public void setup() throws JAXBException {
+           version = new SchemaVersion("v8");
+               dbEngine = new JanusGraphDBEngine(QueryStyle.GREMLIN_UNIQUE,
+                               loaderFactory.createLoaderForVersion(ModelType.MOXY, version),
+                               false);
                unmarshaller = context.createUnmarshaller();
            unmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, "application/json");
            unmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);