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=4bb75dc7436814837b57235d2a0288b9b0679c53;hb=e3938e43b8a1f02f74368ecb75c38530285feac0;hp=4331edb04d06ffb0c6607538e15445e949b21725;hpb=b6bef44f519f1da5d31daf5406a7c57d3d192218;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 4331edb04..4bb75dc74 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.
@@ -21,7 +22,7 @@
 package org.onap.policy.controlloop.actor.test;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -42,10 +43,8 @@ import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig;
 
 /**
  * Superclass for various HttpOperation tests.
- *
- * @param <Q> request type
  */
-public class BasicHttpOperation<Q> extends BasicOperation {
+public class BasicHttpOperation extends BasicOperation {
     protected static final String MY_CLIENT = "my-client";
     protected static final String BASE_URI = "http://my-host:6969/base-uri/";
     protected static final String PATH = "my-path/";
@@ -97,21 +96,21 @@ public class BasicHttpOperation<Q> extends BasicOperation {
     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);
 
-        when(webBuilder.async()).thenReturn(webAsync);
-        when(webBuilder.accept(any(MediaType.class))).thenReturn(webBuilder);
-        when(webBuilder.accept(any(String.class))).thenReturn(webBuilder);
+        lenient().when(webBuilder.async()).thenReturn(webAsync);
+        lenient().when(webBuilder.accept(any(MediaType.class))).thenReturn(webBuilder);
+        lenient().when(webBuilder.accept(any(String.class))).thenReturn(webBuilder);
 
-        when(webTarget.request()).thenReturn(webBuilder);
-        when(webTarget.path(any())).thenReturn(webTarget);
-        when(webTarget.queryParam(any(), any())).thenReturn(webTarget);
+        lenient().when(webTarget.request()).thenReturn(webBuilder);
+        lenient().when(webTarget.path(any())).thenReturn(webTarget);
+        lenient().when(webTarget.queryParam(any(), any())).thenReturn(webTarget);
 
-        when(client.getWebTarget()).thenReturn(webTarget);
+        lenient().when(client.getWebTarget()).thenReturn(webTarget);
 
-        when(client.getBaseUrl()).thenReturn(BASE_URI);
+        lenient().when(client.getBaseUrl()).thenReturn(BASE_URI);
 
         initConfig();
     }
@@ -120,8 +119,8 @@ public class BasicHttpOperation<Q> extends BasicOperation {
      * Initializes a configuration.
      */
     protected void initConfig() {
-        when(config.getClient()).thenReturn(client);
-        when(config.getPath()).thenReturn(PATH);
+        lenient().when(config.getClient()).thenReturn(client);
+        lenient().when(config.getPath()).thenReturn(PATH);
     }
 
     /**