diff options
Diffstat (limited to 'models-interactions/model-actors/actor.sdnr/src/test')
2 files changed, 11 insertions, 10 deletions
diff --git a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java index d1e192277..19b2063da 100644 --- a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java +++ b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.when; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; import org.junit.Test; import org.onap.policy.common.utils.coder.CoderException; @@ -88,7 +89,8 @@ public class ModifyConfigOperationTest extends BasicSdnrOperation { @Test public void testMakeRequest() throws CoderException { - PciRequestWrapper request = oper.makeRequest(1); - assertNotNull(request); + Pair<String, PciRequestWrapper> result = oper.makeRequest(1); + assertNotNull(result.getLeft()); + assertNotNull(result.getRight()); } } diff --git a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java index fc7e86a94..a7bfa3322 100644 --- a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java +++ b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import java.util.Arrays; +import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; import org.junit.Test; import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicOperation.Status; @@ -45,12 +46,7 @@ public class SdnrOperationTest extends BasicSdnrOperation { public void setUp() throws Exception { super.setUp(); - operation = new SdnrOperation(params, config) { - @Override - protected PciRequestWrapper makeRequest(int attempt) { - return super.makeRequest(attempt); - } - }; + operation = new SdnrOperation(params, config) {}; } @Test @@ -61,7 +57,10 @@ public class SdnrOperationTest extends BasicSdnrOperation { @Test public void testMakeRequest() { - PciRequestWrapper request = operation.makeRequest(1); + Pair<String, PciRequestWrapper> result = operation.makeRequest(1); + assertNotNull(result.getLeft()); + + PciRequestWrapper request = result.getRight(); assertNotNull(request.getBody()); assertEquals("1.0", request.getVersion()); @@ -74,7 +73,7 @@ public class SdnrOperationTest extends BasicSdnrOperation { @Test public void testGetExpectedKeyValues() { - PciRequestWrapper request = operation.makeRequest(1); + PciRequestWrapper request = operation.makeRequest(1).getRight(); assertEquals(Arrays.asList(request.getBody().getCommonHeader().getSubRequestId()), operation.getExpectedKeyValues(50, request)); |