implemented sparky graph extensibility

[aai/sparky-be.git] / sparkybe-onap-service / src / test / java / org / onap / aai / sparky / viewandinspect / BaseVisualizationServiceTest.java

diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java
index eeacde1..9be0fe2 100644 (file)
--- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationServiceTest.java
@@ -5,15 +5,11 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.aai.sparky.config.oxm.OxmEntityLookup;
-import org.onap.aai.sparky.config.oxm.OxmModelLoader;
 import org.onap.aai.sparky.dal.ActiveInventoryAdapter;
-import org.onap.aai.sparky.dal.GizmoAdapter;
 import org.onap.aai.sparky.dal.rest.config.RestEndpointConfig;
 import org.onap.aai.sparky.search.SearchServiceAdapter;
 import org.onap.aai.sparky.subscription.config.SubscriptionConfig;
 import org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig;
-import org.onap.aai.sparky.util.OxmModelAndProcessorHelper;
 import org.onap.aai.sparky.viewandinspect.config.VisualizationConfigs;
 import org.onap.aai.sparky.viewandinspect.entity.QueryRequest;
 import org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService;
@@ -26,50 +22,49 @@ public class BaseVisualizationServiceTest {
   private SubscriptionConfig subConfig;
   private RestEndpointConfig endpointEConfig;
   private ElasticSearchSchemaConfig schemaEConfig;
-  private OxmEntityLookup oxmEntityLookup;
-  private GizmoAdapter mockGizmoAdapter;
-  
+  private VisualizationContextBuilder contextBuilder;
+
   private BaseVisualizationService baseVisService;
-  
+
   @Before
   public void init() throws Exception {
-    this.mockAaiAdapter = Mockito.mock(ActiveInventoryAdapter.class);
     this.mockAaiAdapter = Mockito.mock(ActiveInventoryAdapter.class);
     this.mocksearchServiceAdapter = Mockito.mock(SearchServiceAdapter.class);
-    this.mockGizmoAdapter = Mockito.mock(GizmoAdapter.class);
     this.visualizationConfigs = new VisualizationConfigs();
     this.subConfig = new SubscriptionConfig();
     this.endpointEConfig = new RestEndpointConfig();
     this.schemaEConfig = new ElasticSearchSchemaConfig();
-    this.oxmEntityLookup = OxmModelAndProcessorHelper.getInstance().getOxmEntityLookup();
-    
-    OxmModelLoader modelLoader = OxmModelAndProcessorHelper.getInstance().getModelLoader();
-    
-    this.baseVisService = new BaseVisualizationService(modelLoader, visualizationConfigs,
-        mockAaiAdapter, mockGizmoAdapter, mocksearchServiceAdapter, endpointEConfig, schemaEConfig, 1,
-        oxmEntityLookup, subConfig);
+
+    this.contextBuilder = Mockito.mock(VisualizationContextBuilder.class);
+
+    this.baseVisService = new BaseVisualizationService(contextBuilder, visualizationConfigs,
+        mocksearchServiceAdapter, endpointEConfig, schemaEConfig, subConfig);
   }
-  
+
   @Test
   public void testAnalyzeQueryRequestBody() {
-    QueryRequest validResquest = baseVisService.analyzeQueryRequestBody(SchemaVisualizationTestDataBuilder.getQueryRequest());
+    QueryRequest validResquest = baseVisService
+        .analyzeQueryRequestBody(SchemaVisualizationTestDataBuilder.getQueryRequest());
     assertEquals(SchemaVisualizationTestDataBuilder.ROOT_NODE_HASH_ID, validResquest.getHashId());
-    
-    QueryRequest nullRequest = baseVisService.analyzeQueryRequestBody("This String should make the request return null eh!");
+
+    QueryRequest nullRequest = baseVisService
+        .analyzeQueryRequestBody("This String should make the request return null eh!");
     assertEquals(null, nullRequest);
   }
-  
+
   @Test
   public void testBuildVisualizationUsingGenericQuery() {
-    
+
     initializeMocksForBuildVisualizationUsingGenericQueryTest();
-    
-    QueryRequest rootNodeQuery = baseVisService.analyzeQueryRequestBody(SchemaVisualizationTestDataBuilder.getQueryRequest());
-    
+
+    QueryRequest rootNodeQuery = baseVisService
+        .analyzeQueryRequestBody(SchemaVisualizationTestDataBuilder.getQueryRequest());
+
   }
-  
+
   private void initializeMocksForBuildVisualizationUsingGenericQueryTest() {
-    Mockito.when(mockAaiAdapter.queryActiveInventoryWithRetries(Mockito.anyString(), Mockito.anyString(), Mockito.anyInt())).thenReturn(null);
+    Mockito.when(mockAaiAdapter.queryActiveInventoryWithRetries(Mockito.anyString(),
+        Mockito.anyString(), Mockito.anyInt())).thenReturn(null);
   }
-  
+
 }