Return List<Artifact> in ArtifactDownloadManager

[aai/model-loader.git] / src / test / java / org / onap / aai / modelloader / service / TestModelController.java

diff --git a/src/test/java/org/onap/aai/modelloader/service/TestModelController.java b/src/test/java/org/onap/aai/modelloader/service/TestModelController.java
index 9106342..3387b32 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/service/TestModelController.java
+++ b/src/test/java/org/onap/aai/modelloader/service/TestModelController.java
@@ -23,24 +23,21 @@ package org.onap.aai.modelloader.service;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Collections;
 
-import javax.ws.rs.core.Response;
-
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.onap.aai.modelloader.babel.BabelArtifactService;
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
 import org.onap.aai.modelloader.extraction.VnfCatalogExtractor;
 import org.onap.aai.modelloader.notification.ArtifactDownloadManager;
 import org.onap.aai.modelloader.notification.BabelArtifactConverter;
-import org.onap.aai.modelloader.notification.EventCallback;
 import org.onap.aai.modelloader.notification.NotificationPublisher;
 import org.onap.aai.modelloader.restclient.BabelServiceClient;
 import org.onap.aai.modelloader.restclient.BabelServiceClientException;
@@ -48,6 +45,8 @@ import org.onap.aai.modelloader.util.ArtifactTestUtils;
 import org.onap.sdc.api.IDistributionClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.TestPropertySource;
 
 /**
@@ -60,54 +59,47 @@ public class TestModelController {
 
     @Autowired IDistributionClient iDistributionClient;
     @Autowired ModelLoaderConfig modelLoaderConfig;
-    @Autowired EventCallback eventCallback;
     @Autowired ArtifactDeploymentManager artifactDeploymentManager;
     @Autowired BabelArtifactConverter babelArtifactConverter;
     @Autowired NotificationPublisher notificationPublisher;
     @Autowired VnfCatalogExtractor vnfCatalogExtractor;
 
-    @Mock BabelServiceClientFactory clientFactory;
     @Mock BabelServiceClient babelServiceClient;
+    @InjectMocks BabelArtifactService babelArtifactService;
     
     private ModelController modelController;
 
     @BeforeEach
     public void init() throws BabelServiceClientException {
-        when(clientFactory.create(any())).thenReturn(babelServiceClient);
-        when(babelServiceClient.postArtifact(any(), any(), any(), any())).thenReturn(Collections.emptyList());
-        ArtifactDownloadManager artifactDownloadManager = new ArtifactDownloadManager(iDistributionClient, modelLoaderConfig, clientFactory, babelArtifactConverter, notificationPublisher, vnfCatalogExtractor);
-        this.modelController = new ModelController(iDistributionClient, modelLoaderConfig, eventCallback, artifactDeploymentManager, artifactDownloadManager);
-    }
-
-    @AfterEach
-    public void shutdown() {
-        modelController.preShutdownOperations();
+        when(babelServiceClient.postArtifact(any(), any())).thenReturn(Collections.emptyList());
+        ArtifactDownloadManager artifactDownloadManager = new ArtifactDownloadManager(iDistributionClient, notificationPublisher, vnfCatalogExtractor, babelArtifactService);
+        this.modelController = new ModelController(iDistributionClient, modelLoaderConfig, artifactDeploymentManager, artifactDownloadManager);
     }
 
     @Test
     public void testLoadModel() {
-        Response response = modelController.loadModel("");
-        assertThat(response.getStatus(), is(Response.Status.OK.getStatusCode()));
+        ResponseEntity<String> response = modelController.loadModel("");
+        assertThat(response.getStatusCode(), is(HttpStatus.OK));
     }
 
     @Test
     public void testSaveModel() {
-        Response response = modelController.saveModel("", "");
-        assertThat(response.getStatus(), is(Response.Status.OK.getStatusCode()));
+        ResponseEntity<String> response = modelController.saveModel("", "");
+        assertThat(response.getStatusCode(), is(HttpStatus.OK));
     }
 
     @Test
     public void testIngestModel() throws IOException {
         byte[] csarPayload = new ArtifactTestUtils().loadResource("compressedArtifacts/service-VscpaasTest-csar.csar");
-        Response response = modelController.ingestModel("model-name", "", Base64.getEncoder().encodeToString(csarPayload));
-        assertThat(response.getStatus(), is(Response.Status.OK.getStatusCode()));
+        ResponseEntity<String> response = modelController.ingestModel("model-name", "", Base64.getEncoder().encodeToString(csarPayload));
+        assertThat(response.getStatusCode(), is(HttpStatus.OK));
     }
 
     @Test
     public void testIngestModelMissingName() throws IOException {
         byte[] csarPayload = new ArtifactTestUtils().loadResource("compressedArtifacts/service-VscpaasTest-csar.csar");
-        Response response = modelController.ingestModel("", "", Base64.getEncoder().encodeToString(csarPayload));
-        assertThat(response.getStatus(), is(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()));
+        ResponseEntity<String> response = modelController.ingestModel("", "", Base64.getEncoder().encodeToString(csarPayload));
+        assertThat(response.getStatusCode(), is(HttpStatus.INTERNAL_SERVER_ERROR));
     }
 
 }