* 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.
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 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.concurrent.CompletableFuture;
-import javax.ws.rs.client.AsyncInvoker;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.InvocationCallback;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
/**
* 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 = "/base-uri";
- protected static final String PATH = "/my-path";
+ protected static final String BASE_URI = "http://my-host:6969/base-uri/";
+ protected static final String PATH = "my-path/";
@Captor
protected ArgumentCaptor<InvocationCallback<Response>> callbackCaptor;
@Captor
- protected ArgumentCaptor<Entity<Q>> requestCaptor;
+ protected ArgumentCaptor<Entity<String>> requestCaptor;
@Captor
protected ArgumentCaptor<Map<String, Object>> headerCaptor;
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();
}
* 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);
}
/**