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%2FBasicHttpOperation.java;h=54b6d4f3256af38518e12cc1a8bd41fd33c2a4a7;hb=938005505883cf7a636a8840e20e3dc8a0ad9176;hp=4929292961393c5da74f91e99828b80f5f103070;hpb=e44f1a1c58efed9fbe2efce78864aaee3b577003;p=policy%2Fmodels.git 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 492929296..54b6d4f32 100644 --- 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 @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,85 +21,62 @@ package org.onap.policy.controlloop.actor.test; -import static org.mockito.Mockito.when; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; +import jakarta.ws.rs.client.AsyncInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; 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; -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; +import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig; /** * Superclass for various HttpOperation tests. - * - * @param request type */ -public class BasicHttpOperation { - 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 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; + protected static final String BASE_URI = "http://my-host:6969/base-uri/"; + protected static final String PATH = "my-path/"; @Captor protected ArgumentCaptor> callbackCaptor; - @Captor - protected ArgumentCaptor> requestCaptor; - + protected ArgumentCaptor> requestCaptor; @Captor protected ArgumentCaptor> headerCaptor; @Mock - protected ActorService service; - + protected HttpConfig config; + @Mock + protected WebTarget webTarget; + @Mock + protected Builder webBuilder; + @Mock + protected AsyncInvoker webAsync; @Mock protected HttpClient client; - @Mock protected HttpClientFactory factory; - @Mock protected Response rawResponse; - @Mock - protected HttpOperator operator; - - protected CompletableFuture future; - protected ControlLoopOperationParams params; - protected Map 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,81 +86,63 @@ public class BasicHttpOperation { * @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); + @Override + public void setUpBasic() { + super.setUpBasic(); - when(factory.get(MY_CLIENT)).thenReturn(client); + lenient().when(factory.get(MY_CLIENT)).thenReturn(client); - when(rawResponse.getStatus()).thenReturn(200); + lenient().when(rawResponse.getStatus()).thenReturn(200); - future = new CompletableFuture<>(); - when(client.getBaseUrl()).thenReturn(BASE_URI); + lenient().when(webBuilder.async()).thenReturn(webAsync); + lenient().when(webBuilder.accept(any(MediaType.class))).thenReturn(webBuilder); + lenient().when(webBuilder.accept(any(String.class))).thenReturn(webBuilder); - executor = new PseudoExecutor(); + lenient().when(webTarget.request()).thenReturn(webBuilder); + lenient().when(webTarget.path(any())).thenReturn(webTarget); + lenient().when(webTarget.queryParam(any(), any())).thenReturn(webTarget); - makeContext(); + lenient().when(client.getWebTarget()).thenReturn(webTarget); - outcome = params.makeOutcome(); + lenient().when(client.getBaseUrl()).thenReturn(BASE_URI); - initOperator(); + initConfig(); } /** - * Reinitializes {@link #enrichment}, {@link #event}, {@link #context}, and - * {@link #params}. - *

- * Note: {@link #params} is configured to use {@link #executor}. + * Initializes a configuration. */ - 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. - */ - protected void initOperator() { - when(operator.isAlive()).thenReturn(true); - when(operator.getFullName()).thenReturn(actorName + "." + operationName); - when(operator.getActorName()).thenReturn(actorName); - when(operator.getName()).thenReturn(operationName); - when(operator.getClient()).thenReturn(client); - when(operator.getPath()).thenReturn(PATH); + protected void initConfig() { + lenient().when(config.getClient()).thenReturn(client); + lenient().when(config.getPath()).thenReturn(PATH); } /** - * Makes enrichment data. + * Provides a response to an asynchronous HttpClient call. * - * @return enrichment data + * @param response response to be provided to the call + * @return a function that provides the response to the call */ - protected Map makeEnrichment() { - return new TreeMap<>(); + protected Answer> provideResponse(Response response) { + return provideResponse(response, 0); } /** * Provides a response to an asynchronous HttpClient call. * * @param response response to be provided to the call + * @param index index of the callback within the arguments * @return a function that provides the response to the call */ - protected Answer> provideResponse(Response response) { + protected Answer> provideResponse(Response response, int index) { return args -> { - InvocationCallback cb = args.getArgument(0); + InvocationCallback cb = args.getArgument(index); cb.completed(response); return CompletableFuture.completedFuture(response); };