Validate request content of various actors

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

diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java
index 4929292..05fa226 100644 (file)
--- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java
+++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java
@@ -23,8 +23,6 @@ package org.onap.policy.controlloop.actor.test;
 import static org.mockito.Mockito.when;
 
 import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.InvocationCallback;
@@ -32,34 +30,20 @@ import javax.ws.rs.core.Response;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.Answer;
 import org.onap.policy.common.endpoints.http.client.HttpClient;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
-import org.onap.policy.common.utils.time.PseudoExecutor;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.controlloop.actorserviceprovider.ActorService;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
-import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext;
 import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperator;
-import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
 
 /**
  * Superclass for various HttpOperation tests.
  *
  * @param <Q> request type
  */
-public class BasicHttpOperation<Q> {
-    protected static final UUID REQ_ID = UUID.randomUUID();
-    protected static final String DEFAULT_ACTOR = "default-actor";
-    protected static final String DEFAULT_OPERATION = "default-operation";
+public class BasicHttpOperation<Q> extends BasicOperation {
     protected static final String MY_CLIENT = "my-client";
     protected static final String BASE_URI = "/base-uri";
     protected static final String PATH = "/my-path";
-    protected static final String TARGET_ENTITY = "my-target";
-
-    protected final String actorName;
-    protected final String operationName;
 
     @Captor
     protected ArgumentCaptor<InvocationCallback<Response>> callbackCaptor;
@@ -70,9 +54,6 @@ public class BasicHttpOperation<Q> {
     @Captor
     protected ArgumentCaptor<Map<String, Object>> headerCaptor;
 
-    @Mock
-    protected ActorService service;
-
     @Mock
     protected HttpClient client;
 
@@ -85,20 +66,12 @@ public class BasicHttpOperation<Q> {
     @Mock
     protected HttpOperator operator;
 
-    protected CompletableFuture<Response> future;
-    protected ControlLoopOperationParams params;
-    protected Map<String, String> enrichment;
-    protected VirtualControlLoopEvent event;
-    protected ControlLoopEventContext context;
-    protected OperationOutcome outcome;
-    protected PseudoExecutor executor;
 
     /**
      * Constructs the object using a default actor and operation name.
      */
     public BasicHttpOperation() {
-        this.actorName = DEFAULT_ACTOR;
-        this.operationName = DEFAULT_OPERATION;
+        super();
     }
 
     /**
@@ -108,51 +81,24 @@ public class BasicHttpOperation<Q> {
      * @param operation operation name
      */
     public BasicHttpOperation(String actor, String operation) {
-        this.actorName = actor;
-        this.operationName = operation;
+        super(actor, operation);
     }
 
     /**
      * Initializes mocks and sets up.
      */
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        super.setUp();
 
         when(factory.get(MY_CLIENT)).thenReturn(client);
 
         when(rawResponse.getStatus()).thenReturn(200);
 
-        future = new CompletableFuture<>();
         when(client.getBaseUrl()).thenReturn(BASE_URI);
 
-        executor = new PseudoExecutor();
-
-        makeContext();
-
-        outcome = params.makeOutcome();
-
         initOperator();
     }
 
-    /**
-     * Reinitializes {@link #enrichment}, {@link #event}, {@link #context}, and
-     * {@link #params}.
-     * <p/>
-     * Note: {@link #params} is configured to use {@link #executor}.
-     */
-    protected void makeContext() {
-        enrichment = new TreeMap<>(makeEnrichment());
-
-        event = new VirtualControlLoopEvent();
-        event.setRequestId(REQ_ID);
-        event.setAai(enrichment);
-
-        context = new ControlLoopEventContext(event);
-
-        params = ControlLoopOperationParams.builder().executor(executor).context(context).actorService(service)
-                        .actor(actorName).operation(operationName).targetEntity(TARGET_ENTITY).build();
-    }
-
     /**
      * Initializes an operator so that it is "alive" and has the given names.
      */
@@ -165,15 +111,6 @@ public class BasicHttpOperation<Q> {
         when(operator.getPath()).thenReturn(PATH);
     }
 
-    /**
-     * Makes enrichment data.
-     *
-     * @return enrichment data
-     */
-    protected Map<String, String> makeEnrichment() {
-        return new TreeMap<>();
-    }
-
     /**
      * Provides a response to an asynchronous HttpClient call.
      *