1 files changed, 13 insertions, 14 deletions

diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksTest.java
index 47767bac..cefc5c76 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksTest.java
@@ -23,11 +23,10 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException;
-import org.onap.dcaegen2.services.prh.integration.junit5.mockito.MockitoExtension;
 import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
 import org.onap.dcaegen2.services.prh.model.ImmutableConsumerDmaapModel;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishResponse;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -36,14 +35,13 @@ import java.util.Collections;
 import java.util.Map;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
-public class ScheduledTasksTest {
+class ScheduledTasksTest {
     private final static ConsumerDmaapModel DMAAP_MODEL =
             ImmutableConsumerDmaapModel
                     .builder()
@@ -75,12 +73,7 @@ public class ScheduledTasksTest {
     private ScheduledTasks sut;
 
     @BeforeEach
-    void setUp() throws PrhTaskException, SSLException {
-        final Mono<ConsumerDmaapModel> consumerModel = Mono.just(DMAAP_MODEL);
-
-        given(aaiProducer.execute(DMAAP_MODEL)).willReturn(consumerModel);
-        given(bbsActions.execute(DMAAP_MODEL)).willReturn(consumerModel);
-
+    void setUp() {
         sut = new ScheduledTasks(
                 consumer,
                 readyPublisher,
@@ -124,6 +117,12 @@ public class ScheduledTasksTest {
     @Test
     void whenPnfWithoutService_PatchToAaiAndPostToPnfReadyShouldBePerformed() throws SSLException, PrhTaskException {
         //given
+        Mono<ConsumerDmaapModel> consumerModel = Mono.just(DMAAP_MODEL);
+
+        given(aaiProducer.execute(DMAAP_MODEL)).willReturn(consumerModel);
+        given(bbsActions.execute(DMAAP_MODEL)).willReturn(consumerModel);
+
+
         given(consumer.execute()).willReturn(Flux.just(DMAAP_MODEL));
         given(aaiQuery.execute(any())).willReturn(Mono.just(false));
 
@@ -157,16 +156,16 @@ public class ScheduledTasksTest {
         verify(readyPublisher, never()).execute(DMAAP_MODEL);
     }
 
-    private Flux<MessageRouterPublishResponse> verifyThatPnfModelWasNotSentDmaapPnfUpdateTopic() throws PrhTaskException {
-        return verify(updatePublisher, never()).execute(DMAAP_MODEL);
+    private void verifyThatPnfModelWasNotSentDmaapPnfUpdateTopic() throws PrhTaskException {
+        verify(updatePublisher, never()).execute(DMAAP_MODEL);
     }
 
     private void verifyThatPnfModelWasSentDmaapPnfReadyTopic() throws PrhTaskException {
         verify(readyPublisher, atLeastOnce()).execute(DMAAP_MODEL);
     }
 
-    private Flux<MessageRouterPublishResponse> verifyThatPnfModelWasSentDmaapPnfUpdateTopic() throws PrhTaskException {
-        return verify(updatePublisher, atLeastOnce()).execute(DMAAP_MODEL);
+    private void verifyThatPnfModelWasSentDmaapPnfUpdateTopic() throws PrhTaskException {
+        verify(updatePublisher, atLeastOnce()).execute(DMAAP_MODEL);
     }
 
     private void verifyThatPnfUpdateWasNotSentToAai() throws PrhTaskException, SSLException {