diff options
author | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2024-01-29 09:23:58 +0000 |
---|---|---|
committer | Ramesh Murugan Iyer <ramesh.murugan.iyer@est.tech> | 2024-02-08 14:29:41 +0000 |
commit | 49f07db935d114b72a44e446867b16262dd552aa (patch) | |
tree | f6867985541acb76f1e5279ed4104c86dc7adffb /models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java | |
parent | 71be21fd5b9b52c613bb855f00a79a51e81906dd (diff) |
Remove dmaap from models
Issue-ID: POLICY-4402
Change-Id: Icead1601984f463e557b969f2792f0f0aa05f060
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Diffstat (limited to 'models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java')
-rw-r--r-- | models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java | 18 |
1 files changed, 12 insertions, 6 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()); + } } /** |