summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-actors/actor.test/src
diff options
context:
space:
mode:
authorrameshiyer27 <ramesh.murugan.iyer@est.tech>2024-01-29 09:23:58 +0000
committerRamesh Murugan Iyer <ramesh.murugan.iyer@est.tech>2024-02-08 14:29:41 +0000
commit49f07db935d114b72a44e446867b16262dd552aa (patch)
treef6867985541acb76f1e5279ed4104c86dc7adffb /models-interactions/model-actors/actor.test/src
parent71be21fd5b9b52c613bb855f00a79a51e81906dd (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')
-rw-r--r--models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java18
-rw-r--r--models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java11
-rw-r--r--models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java3
3 files changed, 19 insertions, 13 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<>();
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 c708a17cd..ebfc267cc 100644
--- 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
@@ -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.
@@ -149,7 +150,7 @@ public class BasicBidirectionalTopicOperationTest {
@Override
protected TopicServer<String> makeServer(TopicSink sink, TopicSource source) {
- return new TopicServer<String>(sink, source, null, String.class) {
+ return new TopicServer<>(sink, source, null, String.class) {
@Override
protected String process(String request) {
return null;