Merge "Modelloader: base image update"

[aai/model-loader.git] / src / test / java / org / onap / aai / modelloader / notification / TestEventCallback.java

diff --git a/src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java b/src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java
index 1215a7b..08fbb71 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java
+++ b/src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java
@@ -20,21 +20,22 @@
  */
 package org.onap.aai.modelloader.notification;
 
  */
 package org.onap.aai.modelloader.notification;
 

-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
+import static org.mockito.ArgumentMatchers.*;

 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

-

 import java.io.IOException;
 import java.io.IOException;

+import java.util.ArrayList;
+import java.util.Collections;

 import java.util.List;
 import java.util.Properties;
 import java.util.List;
 import java.util.Properties;

-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;

 import org.mockito.Mockito;
 import org.mockito.Mockito;

-import org.mockito.internal.util.reflection.Whitebox;
-import org.onap.aai.modelloader.config.ModelLoaderConfig;
-import org.onap.aai.modelloader.entity.model.BabelArtifactParsingException;
+import org.mockito.MockitoAnnotations;
+import org.onap.aai.modelloader.entity.Artifact;
+import org.onap.aai.modelloader.entity.ArtifactType;

 import org.onap.aai.modelloader.fixture.NotificationDataFixtureBuilder;
 import org.onap.aai.modelloader.service.ArtifactDeploymentManager;
 import org.onap.sdc.api.IDistributionClient;
 import org.onap.aai.modelloader.fixture.NotificationDataFixtureBuilder;
 import org.onap.aai.modelloader.service.ArtifactDeploymentManager;
 import org.onap.sdc.api.IDistributionClient;


@@ -47,36 +48,25 @@ public class TestEventCallback {
 
     private static final String CONFIG_FILE = "model-loader.properties";
 
 
     private static final String CONFIG_FILE = "model-loader.properties";
 

-    private ModelLoaderConfig config;

     private Properties configProperties;
     private EventCallback eventCallback;
 
     private Properties configProperties;
     private EventCallback eventCallback;
 

-    private ArtifactDeploymentManager mockArtifactDeploymentManager;
-    private ArtifactDownloadManager mockArtifactDownloadManager;
-    private IDistributionClient mockDistributionClient;
-    private NotificationPublisher mockNotificationPublisher;
+    @Mock private ArtifactDeploymentManager mockArtifactDeploymentManager;
+    @Mock private ArtifactDownloadManager mockArtifactDownloadManager;
+    @Mock private IDistributionClient mockDistributionClient;
+    @Mock private NotificationPublisher mockNotificationPublisher;

 
 

-    @Before
+    @BeforeEach

     public void setup() throws IOException {
     public void setup() throws IOException {

+        MockitoAnnotations.openMocks(this);

         configProperties = new Properties();
         configProperties.load(this.getClass().getClassLoader().getResourceAsStream(CONFIG_FILE));
         configProperties = new Properties();
         configProperties.load(this.getClass().getClassLoader().getResourceAsStream(CONFIG_FILE));

-        config = new ModelLoaderConfig(configProperties, null);
-
-        mockArtifactDeploymentManager = mock(ArtifactDeploymentManager.class);
-        mockArtifactDownloadManager = mock(ArtifactDownloadManager.class);
-        mockDistributionClient = mock(IDistributionClient.class);
-        mockNotificationPublisher = mock(NotificationPublisher.class);
-
-        eventCallback = new EventCallback(mockDistributionClient, config);

 
 

-        Whitebox.setInternalState(eventCallback, "artifactDeploymentManager", mockArtifactDeploymentManager);
-        Whitebox.setInternalState(eventCallback, "artifactDownloadManager", mockArtifactDownloadManager);
-        Whitebox.setInternalState(eventCallback, "notificationPublisher", mockNotificationPublisher);
+        eventCallback = new EventCallback(mockDistributionClient, mockArtifactDeploymentManager, mockArtifactDownloadManager, mockNotificationPublisher);

     }
 
     }
 

-    @After
+    @AfterEach

     public void tearDown() {
     public void tearDown() {

-        config = null;

         configProperties = null;
         eventCallback = null;
         mockArtifactDeploymentManager = null;
         configProperties = null;
         eventCallback = null;
         mockArtifactDeploymentManager = null;


@@ -86,34 +76,49 @@ public class TestEventCallback {
 
     @Test
     @SuppressWarnings("unchecked")
 
     @Test
     @SuppressWarnings("unchecked")

-    public void activateCallback_downloadFails() {
+    public void activateCallback_downloadFails() throws Exception {

         INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithToscaCsarFile();
 
         INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithToscaCsarFile();
 

-        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class),
-                any(List.class), any(List.class))).thenReturn(false);
+        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class)
+        )).thenThrow(DownloadFailureException.class);

 
         eventCallback.activateCallback(data);
 
 
         eventCallback.activateCallback(data);
 

-        verify(mockArtifactDownloadManager).downloadArtifacts(any(INotificationData.class), any(List.class),
-                any(List.class), any(List.class));
-        Mockito.verifyZeroInteractions(mockArtifactDeploymentManager);
+        verify(mockArtifactDownloadManager).downloadArtifacts(any(INotificationData.class), any(List.class));
+        Mockito.verifyNoInteractions(mockArtifactDeploymentManager);

     }
 
     @SuppressWarnings("unchecked")
     @Test
     }
 
     @SuppressWarnings("unchecked")
     @Test

-    public void activateCallback() throws BabelArtifactParsingException {
+    public void activateCallback() throws Exception {

         INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithToscaCsarFile();
 
         INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithToscaCsarFile();
 

-        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class),
-                any(List.class), any(List.class))).thenReturn(true);
+        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class)))
+                .thenReturn(Collections.emptyList());

 
 

-        when(mockArtifactDeploymentManager.deploy(any(INotificationData.class), any(List.class), any(List.class)))
+        when(mockArtifactDeploymentManager.deploy(any(String.class), any(List.class), any(List.class)))

                 .thenReturn(true);
 
         eventCallback.activateCallback(data);
 
                 .thenReturn(true);
 
         eventCallback.activateCallback(data);
 

-        verify(mockArtifactDownloadManager).downloadArtifacts(any(INotificationData.class), any(List.class),
-                any(List.class), any(List.class));
-        verify(mockArtifactDeploymentManager).deploy(any(INotificationData.class), any(List.class), any(List.class));
+        verify(mockArtifactDownloadManager).downloadArtifacts(any(INotificationData.class), any(List.class));
+        verify(mockArtifactDeploymentManager).deploy(any(String.class), any(List.class), any(List.class));
+    }
+    @Test
+    public void testActivateCallback_withVnfCatalogArtifacts() throws Exception {
+        INotificationData data = NotificationDataFixtureBuilder.getNotificationDataWithCatalogFile();
+
+        List<Artifact> downloadedArtifacts = new ArrayList<>();
+        downloadedArtifacts.add(new Artifact(ArtifactType.MODEL));
+        downloadedArtifacts.add(new Artifact(ArtifactType.VNF_CATALOG));
+
+        when(mockArtifactDownloadManager.downloadArtifacts(any(INotificationData.class), any(List.class)))
+                .thenReturn(downloadedArtifacts);
+
+        eventCallback.activateCallback(data);
+
+        verify(mockArtifactDeploymentManager).deploy(eq("ID"),
+                argThat(list -> list.stream().anyMatch(a -> a.getType() == ArtifactType.MODEL)),
+                anyList());

     }
 }
     }
 }