X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fnotification%2FTestEventCallback.java;fp=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fnotification%2FTestEventCallback.java;h=8276d90b0a226960d6d1d9077e4e372d52794cee;hb=378fac344f2de5a89b5410b9031e76841cd8fba6;hp=eb326fd7942c0e674de4878516f548b4a36d2ede;hpb=3481baf3e358ec242c775b400b98a1e1a5f6e1ce;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 eb326fd..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; @@ -28,18 +28,17 @@ import static org.mockito.Mockito.when; import java.io.IOException; import java.util.List; import java.util.Properties; - 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}. @@ -70,9 +69,9 @@ public class TestEventCallback { 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