Make targetEntity a property

[policy/models.git] / models-interactions / model-actors / actor.test / src / main / java / org / onap / policy / controlloop / actor / test / BasicOperation.java

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 989f6a7..a0bb58e 100644 (file)
--- 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
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.TreeMap;
 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;
@@ -53,14 +54,25 @@ import org.onap.policy.controlloop.policy.PolicyResult;
  * Superclass for various Operation tests.
  */
 public class BasicOperation {
-    protected static final Coder coder = new StandardCoder();
     protected static final UUID REQ_ID = UUID.randomUUID();
-    protected static final String DEFAULT_ACTOR = "default-actor";
-    protected static final String DEFAULT_OPERATION = "default-operation";
+    protected static final String SUB_REQ_ID = "my-sub-request-id";
+    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 -> {
+        Thread thread = new Thread(command);
+        thread.setDaemon(true);
+        thread.start();
+    };
 
     protected final String actorName;
     protected final String operationName;
+    protected Coder coder = new StandardCoder();
 
     @Mock
     protected ActorService service;
@@ -124,7 +136,7 @@ public class BasicOperation {
         when(guardActor.getOperator(OperationPartial.GUARD_OPERATION_NAME)).thenReturn(guardOperator);
         when(guardOperator.buildOperation(any())).thenReturn(guardOperation);
 
-        outcome = params.makeOutcome();
+        outcome = params.makeOutcome(TARGET_ENTITY);
         outcome.setResult(PolicyResult.SUCCESS);
         when(guardOperation.start()).thenReturn(CompletableFuture.completedFuture(outcome));
 
@@ -135,7 +147,7 @@ public class BasicOperation {
         when(cqOperation.start()).thenReturn(cqFuture);
 
         // get a fresh outcome
-        outcome = params.makeOutcome();
+        outcome = params.makeOutcome(TARGET_ENTITY);
     }
 
     /**
@@ -150,6 +162,10 @@ public class BasicOperation {
         event = new VirtualControlLoopEvent();
         event.setRequestId(REQ_ID);
         event.setAai(enrichment);
+        event.setClosedLoopControlName(CL_NAME);
+        event.setPolicyName(EVENT_POLICY_NAME);
+        event.setPolicyVersion(EVENT_POLICY_VERSION);
+        event.setVersion(EVENT_VERSION);
 
         context = new ControlLoopEventContext(event);
 
@@ -210,7 +226,7 @@ public class BasicOperation {
      */
     protected void provideCqResponse(AaiCqResponse cq) {
         context.setProperty(AaiCqResponse.CONTEXT_KEY, cq);
-        OperationOutcome outcome2 = params.makeOutcome();
+        OperationOutcome outcome2 = params.makeOutcome(TARGET_ENTITY);
         outcome2.setResult(PolicyResult.SUCCESS);
         cqFuture.complete(outcome2);
     }