X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fnotification%2FTestEventCallback.java;h=8276d90b0a226960d6d1d9077e4e372d52794cee;hb=refs%2Fchanges%2F63%2F93163%2F1;hp=1215a7b659aa10f842c13db24f22d88915e8a682;hpb=c5aea4a8bc398fc1c6220875e55b9520fd7f7524;p=aai%2Fmodel-loader.git 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..8276d90 100644 --- a/src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java +++ b/src/test/java/org/onap/aai/modelloader/notification/TestEventCallback.java @@ -20,7 +20,7 @@ */ package org.onap.aai.modelloader.notification; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,13 +32,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; 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.onap.aai.modelloader.fixture.NotificationDataFixtureBuilder; import org.onap.aai.modelloader.service.ArtifactDeploymentManager; import org.onap.sdc.api.IDistributionClient; import org.onap.sdc.api.notification.INotificationData; +import org.springframework.test.util.ReflectionTestUtils; /** * Tests {@link EventCallback}. @@ -67,11 +67,11 @@ public class TestEventCallback { mockDistributionClient = mock(IDistributionClient.class); mockNotificationPublisher = mock(NotificationPublisher.class); - eventCallback = new EventCallback(mockDistributionClient, config); + eventCallback = new EventCallback(mockDistributionClient, config, null); - Whitebox.setInternalState(eventCallback, "artifactDeploymentManager", mockArtifactDeploymentManager); - Whitebox.setInternalState(eventCallback, "artifactDownloadManager", mockArtifactDownloadManager); - Whitebox.setInternalState(eventCallback, "notificationPublisher", mockNotificationPublisher); + ReflectionTestUtils.setField(eventCallback, "artifactDeploymentManager", mockArtifactDeploymentManager); + ReflectionTestUtils.setField(eventCallback, "artifactDownloadManager", mockArtifactDownloadManager); + ReflectionTestUtils.setField(eventCallback, "notificationPublisher", mockNotificationPublisher); } @After