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;fp=models-interactions%2Fmodel-actors%2Factor.test%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Ftest%2FBasicBidirectionalTopicOperation.java;h=d0e89a13ca227fc9cb38b667bc586785b0b70481;hb=49f07db935d114b72a44e446867b16262dd552aa;hp=263fd2401728ebceaa5ba5eb746f5b4a6f150d43;hpb=71be21fd5b9b52c613bb855f00a79a51e81906dd;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 263fd2401..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,7 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * 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.
@@ -22,6 +22,7 @@
 package org.onap.policy.controlloop.actor.test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.lenient;
 
 import java.util.List;
@@ -97,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);
 
@@ -154,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());
+        }
     }
 
     /**