diff options
author | LaMont, William (wl2432) <wl2432@att.com> | 2019-01-11 15:21:39 -0500 |
---|---|---|
committer | LaMont, William (wl2432) <wl2432@us.att.com> | 2019-01-16 11:56:04 -0500 |
commit | 16b48ab05e63fca707585b4ecee466b8b7721a1b (patch) | |
tree | bca44c248860f73d65031162a6f5581c4fef649b /aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java | |
parent | c0365f15a25aed95f7e812dc1d7e7ac588ebbed5 (diff) |
Update traversal to support v15
Issue-ID: AAI-2073
Change-Id: I1c3df218d1333bdebc984947edc100607958ab60
Signed-off-by: LaMont, William (wl2432) <wl2432@us.att.com>
Diffstat (limited to 'aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java')
-rw-r--r-- | aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java index 29cd505..0bc4dbe 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java @@ -35,6 +35,7 @@ import org.junit.runners.Parameterized; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.onap.aai.config.IntrospectionConfig; +import org.onap.aai.config.SearchConfiguration; import org.onap.aai.config.SpringContextAware; import org.onap.aai.edges.EdgeIngestor; import org.onap.aai.edges.exceptions.AmbiguousRuleChoiceException; @@ -54,8 +55,8 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.onap.aai.query.builder.GremlinTraversal; -import org.onap.aai.restcore.search.GremlinGroovyShellSingleton; -import org.onap.aai.restcore.search.GroovyQueryBuilderSingleton; +import org.onap.aai.restcore.search.GremlinGroovyShell; +import org.onap.aai.restcore.search.GroovyQueryBuilder; import org.onap.aai.serialization.db.EdgeSerializer; import org.onap.aai.serialization.db.exceptions.NoEdgeRuleFoundException; import org.onap.aai.serialization.engines.QueryStyle; @@ -77,7 +78,7 @@ import static org.mockito.Mockito.when; EdgeSerializer.class, NodeIngestor.class, SpringContextAware.class, - GremlinServerSingleton.class, + SearchConfiguration.class, IntrospectionConfig.class }) @TestPropertySource(properties = { @@ -94,7 +95,7 @@ public abstract class QueryTest { protected EELFLogger logger; protected Graph graph; - protected GremlinGroovyShellSingleton shell; + protected GremlinGroovyShell shell; @Mock protected TransactionalGraphEngine dbEngine; protected final List<Vertex> expectedResult = new ArrayList<>(); @@ -148,7 +149,7 @@ public abstract class QueryTest { graph = TinkerGraph.open(); gts = graph.traversal(); createGraph(); - shell = GremlinGroovyShellSingleton.getInstance(); + shell = new GremlinGroovyShell(); loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, version); setUpQuery(); } @@ -160,7 +161,7 @@ public abstract class QueryTest { addParam(params); when(dbEngine.getQueryBuilder(any(QueryStyle.class))).thenReturn(new GremlinTraversal<>(loader, graph.traversal())); logger.info("Stored query in abstraction form {}", query); - query = GroovyQueryBuilderSingleton.getInstance().executeTraversal(dbEngine, query, params); + query = new GroovyQueryBuilder().executeTraversal(dbEngine, query, params); logger.info("After converting to gremlin query {}", query); query = "g" + query; GraphTraversal<Vertex, Vertex> g = graph.traversal().V(); |