X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.test%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Ftest%2FBasicBidirectionalTopicOperation.java;h=d0e89a13ca227fc9cb38b667bc586785b0b70481;hb=refs%2Fchanges%2F90%2F137190%2F1;hp=3e06f1c1132e413a753453c703fb6034814aa26a;hpb=385e119cf90ee2ba83377115c98b3cf60f993158;p=policy%2Fmodels.git

diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java
index 3e06f1c11..d0e89a13c 100644
--- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java
+++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023-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.
@@ -21,10 +22,13 @@
 package org.onap.policy.controlloop.actor.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.lenient;
 
 import java.util.List;
 import java.util.function.BiConsumer;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -49,6 +53,7 @@ import org.onap.policy.simulators.Util;
  *
  * @param <Q> request type
  */
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation {
     protected static final String MY_SINK = "my-sink";
     protected static final String MY_SOURCE = "my-source";
@@ -79,12 +84,6 @@ public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation
 
     private TopicServer<Q> topicServer;
 
-    /**
-     * Constructs the object using a default actor and operation name.
-     */
-    protected BasicBidirectionalTopicOperation() {
-        super();
-    }
 
     /**
      * Constructs the object.
@@ -99,20 +98,17 @@ public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation
     /**
      * Starts the topic.
      *
-     * @throws InterruptedException if interrupted
      * @throws BidirectionalTopicClientException if the client cannot be built
      */
     protected static void initBeforeClass(String sinkTopic, String sourceTopic)
-                    throws InterruptedException, BidirectionalTopicClientException {
-
-        Util.buildDmaapSim();
+                    throws BidirectionalTopicClientException {
 
         // note: the sink and source names are swapped for the simulator
         var ptopic = new TopicParameters();
         ptopic.setTopic(sourceTopic);
         ptopic.setManaged(true);
         ptopic.setServers(List.of("localhost"));
-        ptopic.setTopicCommInfrastructure("dmaap");
+        ptopic.setTopicCommInfrastructure("NOOP");
         ptopic.setFetchTimeout(500);
         serverSink = TopicEndpointManager.getManager().addTopicSinks(List.of(ptopic)).get(0);
 
@@ -156,8 +152,16 @@ public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation
         initConfig();
     }
 
+    /**
+     * Finish all topic servers and mocks.
+     */
     public void tearDownBasic() {
         topicServer.shutdown();
+        try {
+            closeable.close();
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
     }
 
     /**
@@ -173,9 +177,9 @@ public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation
      * Initializes a configuration.
      */
     protected void initConfig() {
-        when(config.getTopicHandler()).thenReturn(topicHandler);
-        when(config.getForwarder()).thenReturn(forwarder);
-        when(config.getTimeoutMs()).thenReturn(TIMEOUT_MS);
+        lenient().when(config.getTopicHandler()).thenReturn(topicHandler);
+        lenient().when(config.getForwarder()).thenReturn(forwarder);
+        lenient().when(config.getTimeoutMs()).thenReturn(TIMEOUT_MS);
     }
 
     /**