aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/aai/modelloader/service/TestModelController.java10
-rw-r--r--src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java10
2 files changed, 3 insertions, 17 deletions
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 82f7203..9d7d5ea 100644
--- a/src/test/java/org/onap/aai/modelloader/service/TestModelController.java
+++ b/src/test/java/org/onap/aai/modelloader/service/TestModelController.java
@@ -31,7 +31,6 @@ 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.Mock;
@@ -39,7 +38,6 @@ 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;
@@ -59,7 +57,6 @@ public class TestModelController {
@Autowired IDistributionClient iDistributionClient;
@Autowired ModelLoaderConfig modelLoaderConfig;
- @Autowired EventCallback eventCallback;
@Autowired ArtifactDeploymentManager artifactDeploymentManager;
@Autowired BabelArtifactConverter babelArtifactConverter;
@Autowired NotificationPublisher notificationPublisher;
@@ -75,12 +72,7 @@ public class TestModelController {
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();
+ this.modelController = new ModelController(iDistributionClient, modelLoaderConfig, artifactDeploymentManager, artifactDownloadManager);
}
@Test
diff --git a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java
index a8501be..6dc1b3d 100644
--- a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java
+++ b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java
@@ -28,7 +28,6 @@ import java.util.Base64;
import javax.ws.rs.core.Response;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.onap.aai.modelloader.util.ArtifactTestUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,17 +43,12 @@ import org.springframework.test.context.TestPropertySource;
public class TestModelLoaderServiceWithSdc {
@Autowired
- private ModelController service;
-
- @AfterEach
- public void shutdown() {
- service.preShutdownOperations();
- }
+ private ModelController controller;
@Test
public void testIngestModel() throws IOException {
byte[] csarPayload = new ArtifactTestUtils().loadResource("compressedArtifacts/service-VscpaasTest-csar.csar");
- Response response = service.ingestModel("model-name", "", Base64.getEncoder().encodeToString(csarPayload));
+ Response response = controller.ingestModel("model-name", "", Base64.getEncoder().encodeToString(csarPayload));
assertThat(response.getStatus(), is(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()));
}