Remove dmaap from models

[policy/models.git] / models-interactions / model-actors / actor.test / src / test / java / org / onap / policy / controlloop / actor / test / BasicBidirectionalTopicOperationTest.java

diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
index afb8f07..ebfc267 100644 (file)
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
@@ -2,7 +2,8 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,14 +34,16 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 import org.onap.policy.common.endpoints.event.comm.TopicSource;
 import org.onap.policy.common.utils.coder.StandardCoderObject;
 import org.onap.policy.simulators.TopicServer;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BasicBidirectionalTopicOperationTest {
     private static final String ACTOR = "my-actor";
     private static final String OPERATION = "my-operation";
@@ -48,7 +51,7 @@ public class BasicBidirectionalTopicOperationTest {
     @Mock
     private BiConsumer<String, StandardCoderObject> listener;
 
-    private BasicBidirectionalTopicOperation oper;
+    private BasicBidirectionalTopicOperation<String> oper;
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
@@ -66,8 +69,6 @@ public class BasicBidirectionalTopicOperationTest {
      */
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
         oper = new MyOperation(ACTOR, OPERATION);
         oper.setUpBasic();
     }
@@ -103,7 +104,6 @@ public class BasicBidirectionalTopicOperationTest {
     @Test
     public void testSetUp() {
         assertNotNull(oper.config);
-        assertNotNull(oper.context);
         assertNotNull(oper.outcome);
         assertNotNull(oper.executor);
     }
@@ -133,7 +133,7 @@ public class BasicBidirectionalTopicOperationTest {
                         .withMessage("response is not a Map");
     }
 
-    private static class MyOperation extends BasicBidirectionalTopicOperation {
+    private static class MyOperation extends BasicBidirectionalTopicOperation<String> {
         public MyOperation() {
             super();
         }
@@ -149,9 +149,8 @@ public class BasicBidirectionalTopicOperationTest {
         }
 
         @Override
-        @SuppressWarnings("rawtypes")
-        protected TopicServer makeServer(TopicSink sink, TopicSource source) {
-            return new TopicServer<String>(sink, source, null, String.class) {
+        protected TopicServer<String> makeServer(TopicSink sink, TopicSource source) {
+            return new TopicServer<>(sink, source, null, String.class) {
                 @Override
                 protected String process(String request) {
                     return null;