diff options
Diffstat (limited to 'models-interactions/model-actors/actor.test')
5 files changed, 28 insertions, 22 deletions
diff --git a/models-interactions/model-actors/actor.test/pom.xml b/models-interactions/model-actors/actor.test/pom.xml index a17b4a72c..4499f287c 100644 --- a/models-interactions/model-actors/actor.test/pom.xml +++ b/models-interactions/model-actors/actor.test/pom.xml @@ -2,6 +2,7 @@ <!-- ============LICENSE_START======================================================= 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. @@ -69,11 +70,6 @@ <version>${policy.common.version}</version> </dependency> <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito2</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>compile</scope> diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java index 215286ef9..263fd2401 100644 --- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java +++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 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.junit.Assert.assertEquals; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.lenient; import java.util.List; import java.util.function.BiConsumer; @@ -170,9 +171,9 @@ public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation * Initializes a configuration. */ protected void initConfig() { - when(config.getTopicHandler()).thenReturn(topicHandler); - when(config.getForwarder()).thenReturn(forwarder); - when(config.getTimeoutMs()).thenReturn(TIMEOUT_MS); + lenient().when(config.getTopicHandler()).thenReturn(topicHandler); + lenient().when(config.getForwarder()).thenReturn(forwarder); + lenient().when(config.getTimeoutMs()).thenReturn(TIMEOUT_MS); } /** 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 02225759c..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; @@ -95,21 +96,21 @@ public class BasicHttpOperation 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(); } @@ -118,8 +119,8 @@ public class BasicHttpOperation 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); } /** diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java index 62c19b80a..c0351d12c 100644 --- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java +++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.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. @@ -30,7 +31,10 @@ import javax.ws.rs.client.InvocationCallback; import javax.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; +@RunWith(MockitoJUnitRunner.class) public class BasicHttpOperationTest { private static final String ACTOR = "my-actor"; private static final String OPERATION = "my-operation"; diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java index 758acf75e..34d0d122d 100644 --- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java +++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.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. @@ -28,10 +29,13 @@ import static org.junit.Assert.assertSame; import java.util.Map; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.controlloop.actorserviceprovider.Util; +@RunWith(MockitoJUnitRunner.class) public class BasicOperationTest { private static final String ACTOR = "my-actor"; private static final String OPERATION = "my-operation"; |