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%2FBasicOperation.java;h=b037189b0c1c3545b076d4cf344bbc6a6b758c3e;hb=49f07db935d114b72a44e446867b16262dd552aa;hp=39adbf55d50a8b3e9ce1eb6d58469cbfed92ceb5;hpb=71be21fd5b9b52c613bb855f00a79a51e81906dd;p=policy%2Fmodels.git

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<>();