Upgrade and clean up dependencies

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

diff --git a/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/BasicVfcOperation.java b/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/BasicVfcOperation.java
index 47371d2..d83fd8b 100644 (file)
--- a/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/BasicVfcOperation.java
+++ b/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/BasicVfcOperation.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,24 +21,24 @@
 
 package org.onap.policy.controlloop.actor.vfc;
 
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 import org.mockito.Mock;
 import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
 import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
 import org.onap.policy.controlloop.actor.test.BasicHttpOperation;
+import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig;
 import org.onap.policy.simulators.Util;
-import org.onap.policy.vfc.VfcRequest;
 import org.onap.policy.vfc.VfcResponse;
 
-public abstract class BasicVfcOperation extends BasicHttpOperation<VfcRequest> {
-    public static final String PATH_GET = "my-path-get/";
-    public static final int MAX_GETS = 3;
-    public static final int WAIT_SEC_GETS = 20;
+public abstract class BasicVfcOperation extends BasicHttpOperation {
+    public static final String POLL_PATH = "my-path-get/";
+    public static final int MAX_POLLS = 3;
+    public static final int POLL_WAIT_SEC = 20;
 
     @Mock
-    protected VfcConfig config;
+    protected HttpPollingConfig config;
 
     protected VfcResponse response;
 
@@ -84,8 +85,8 @@ public abstract class BasicVfcOperation extends BasicHttpOperation<VfcRequest> {
 
         // PLD
 
-        when(rawResponse.getStatus()).thenReturn(200);
-        when(rawResponse.readEntity(String.class)).thenReturn(coder.encode(response));
+        lenient().when(rawResponse.getStatus()).thenReturn(200);
+        lenient().when(rawResponse.readEntity(String.class)).thenReturn(coder.encode(response));
 
         initConfig();
     }
@@ -93,10 +94,10 @@ public abstract class BasicVfcOperation extends BasicHttpOperation<VfcRequest> {
     @Override
     protected void initConfig() {
         super.initConfig();
-        when(config.getClient()).thenReturn(client);
-        when(config.getMaxGets()).thenReturn(MAX_GETS);
-        when(config.getPathGet()).thenReturn(PATH_GET);
-        when(config.getWaitSecGet()).thenReturn(WAIT_SEC_GETS);
+        lenient().when(config.getClient()).thenReturn(client);
+        lenient().when(config.getMaxPolls()).thenReturn(MAX_POLLS);
+        lenient().when(config.getPollPath()).thenReturn(POLL_PATH);
+        lenient().when(config.getPollWaitSec()).thenReturn(POLL_WAIT_SEC);
     }
 
 }