diff options
Diffstat (limited to 'models-interactions/model-actors/actor.test/src/main')
2 files changed, 17 insertions, 12 deletions
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()); + } } /** diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java index 39adbf55d..b037189b0 100644 --- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java +++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * 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. @@ -22,11 +23,11 @@ package org.onap.policy.controlloop.actor.test; import static org.junit.Assert.assertEquals; +import jakarta.ws.rs.core.Response; import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import javax.ws.rs.core.Response; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.onap.policy.common.utils.coder.Coder; @@ -47,10 +48,6 @@ public class BasicOperation { protected static final String DEFAULT_ACTOR = "default-Actor"; protected static final String DEFAULT_OPERATION = "default-Operation"; protected static final String TARGET_ENTITY = "my-target"; - protected static final String CL_NAME = "my-closed-loop"; - protected static final String EVENT_POLICY_NAME = "my-event-policy-name"; - protected static final String EVENT_POLICY_VERSION = "my-event-policy-version"; - protected static final String EVENT_VERSION = "my-event-version"; protected static final Executor blockingExecutor = command -> { var thread = new Thread(command); @@ -70,6 +67,8 @@ public class BasicOperation { protected OperationOutcome outcome; protected PseudoExecutor executor; + protected AutoCloseable closeable; + /** * Constructs the object using a default actor and operation name. */ @@ -93,7 +92,7 @@ public class BasicOperation { * Initializes mocks and sets up. */ public void setUpBasic() { - MockitoAnnotations.openMocks(this); + closeable = MockitoAnnotations.openMocks(this); future = new CompletableFuture<>(); |