Fix sonars from depeendency upgrade

[policy/models.git] / models-interactions / model-actors / actorServiceProvider / src / test / java / org / onap / policy / controlloop / actorserviceprovider / impl / BidirectionalTopicActorTest.java

diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicActorTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicActorTest.java
index e1606ae..64d530d 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicActorTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicActorTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,8 +38,9 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
 import org.onap.policy.common.endpoints.event.comm.client.BidirectionalTopicClientException;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
@@ -47,6 +48,7 @@ import org.onap.policy.controlloop.actorserviceprovider.parameters.Bidirectional
 import org.onap.policy.controlloop.actorserviceprovider.parameters.ParameterValidationRuntimeException;
 import org.onap.policy.controlloop.actorserviceprovider.topic.BidirectionalTopicHandler;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BidirectionalTopicActorTest {
 
     private static final String ACTOR = "my-actor";
@@ -61,7 +63,7 @@ public class BidirectionalTopicActorTest {
     @Mock
     private BidirectionalTopicHandler handler2;
 
-    private BidirectionalTopicActor actor;
+    private BidirectionalTopicActor<BidirectionalTopicActorParams> actor;
 
 
     /**
@@ -90,8 +92,6 @@ public class BidirectionalTopicActorTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
         actor = new MyActor();
         actor.configure(Util.translateToMap(ACTOR, makeParams()));
     }
@@ -157,7 +157,8 @@ public class BidirectionalTopicActorTest {
     public void testMakeOperatorParameters() {
         BidirectionalTopicActorParams params = makeParams();
 
-        final BidirectionalTopicActor prov = new BidirectionalTopicActor(ACTOR);
+        final BidirectionalTopicActor<BidirectionalTopicActorParams> prov =
+                        new BidirectionalTopicActor<>(ACTOR, BidirectionalTopicActorParams.class);
         Function<String, Map<String, Object>> maker =
                         prov.makeOperatorParameters(Util.translateToMap(prov.getName(), params));
 
@@ -171,8 +172,9 @@ public class BidirectionalTopicActorTest {
                         new TreeMap<>(maker.apply("operB")).toString());
 
         // with invalid actor parameters
-        params.setOperation(null);
-        assertThatThrownBy(() -> prov.makeOperatorParameters(Util.translateToMap(prov.getName(), params)))
+        params.setOperations(null);
+        Map<String, Object> map = Util.translateToMap(prov.getName(), params);
+        assertThatThrownBy(() -> prov.makeOperatorParameters(map))
                         .isInstanceOf(ParameterValidationRuntimeException.class);
     }
 
@@ -193,7 +195,7 @@ public class BidirectionalTopicActorTest {
     @Test
     public void testMakeTopicHandler() {
         // use a real actor
-        actor = new BidirectionalTopicActor(ACTOR);
+        actor = new BidirectionalTopicActor<>(ACTOR, BidirectionalTopicActorParams.class);
 
         handler1 = actor.getTopicHandler(MY_SINK, MY_SOURCE1);
         handler2 = actor.getTopicHandler(MY_SINK, MY_SOURCE2);
@@ -211,17 +213,17 @@ public class BidirectionalTopicActorTest {
         params.setTimeoutSec(TIMEOUT);
 
         // @formatter:off
-        params.setOperation(Map.of(
+        params.setOperations(Map.of(
                         "operA", Map.of(),
                         "operB", Map.of("sourceTopic", "topicB")));
         // @formatter:on
         return params;
     }
 
-    private class MyActor extends BidirectionalTopicActor {
+    private class MyActor extends BidirectionalTopicActor<BidirectionalTopicActorParams> {
 
         public MyActor() {
-            super(ACTOR);
+            super(ACTOR, BidirectionalTopicActorParams.class);
         }
 
         @Override