X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2FactorServiceProvider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factorserviceprovider%2Fimpl%2FBidirectionalTopicOperationTest.java;h=14b1daf49661a0d3f2319dc99ba2483c6597da89;hb=f456cc5c8e1efd15edb6da718e1428d8fd7c66c5;hp=48669f799c31daf477ec3b3a9038aa0113787fa2;hpb=e8af063efc33258c32d5843d6b3aad7df0216a95;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java index 48669f799..14b1daf49 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java @@ -35,12 +35,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -54,11 +55,11 @@ import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.coder.StandardCoderObject; import org.onap.policy.common.utils.time.PseudoExecutor; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationResult; import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.topic.BidirectionalTopicHandler; import org.onap.policy.controlloop.actorserviceprovider.topic.Forwarder; -import org.onap.policy.controlloop.policy.PolicyResult; public class BidirectionalTopicOperationTest { private static final CommInfrastructure SINK_INFRA = CommInfrastructure.NOOP; @@ -67,7 +68,6 @@ public class BidirectionalTopicOperationTest { private static final String OPERATION = "my-operation"; private static final String REQ_ID = "my-request-id"; private static final String TEXT = "some text"; - private static final String SUB_REQID = "my-sub-request-id"; private static final int TIMEOUT_SEC = 10; private static final long TIMEOUT_MS = 1000 * TIMEOUT_SEC; private static final int MAX_REQUESTS = 100; @@ -87,6 +87,7 @@ public class BidirectionalTopicOperationTest { private ControlLoopOperationParams params; private OperationOutcome outcome; private StandardCoderObject stdResponse; + private MyResponse response; private String responseText; private PseudoExecutor executor; private int ntimes; @@ -109,9 +110,11 @@ public class BidirectionalTopicOperationTest { executor = new PseudoExecutor(); params = ControlLoopOperationParams.builder().actor(ACTOR).operation(OPERATION).executor(executor).build(); - outcome = params.makeOutcome(); + outcome = params.makeOutcome(null); - responseText = coder.encode(new MyResponse()); + response = new MyResponse(); + response.setRequestId(REQ_ID); + responseText = coder.encode(response); stdResponse = coder.decode(responseText, StandardCoderObject.class); ntimes = 1; @@ -138,8 +141,6 @@ public class BidirectionalTopicOperationTest { CompletableFuture future = oper.startOperationAsync(1, outcome); assertFalse(future.isDone()); - assertEquals(SUB_REQID, outcome.getSubRequestId()); - verify(forwarder).register(eq(Arrays.asList(REQ_ID)), listenerCaptor.capture()); verify(forwarder, never()).unregister(any(), any()); @@ -162,7 +163,8 @@ public class BidirectionalTopicOperationTest { assertTrue(future.isDone()); assertSame(outcome, future.get()); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + assertEquals(OperationResult.SUCCESS, outcome.getResult()); + assertEquals(response, outcome.getResponse()); verify(forwarder).unregister(eq(Arrays.asList(REQ_ID)), eq(listenerCaptor.getValue())); } @@ -183,8 +185,6 @@ public class BidirectionalTopicOperationTest { CompletableFuture future = oper.startOperationAsync(1, outcome); assertFalse(future.isDone()); - assertEquals(SUB_REQID, outcome.getSubRequestId()); - verify(forwarder).register(eq(Arrays.asList(REQ_ID)), listenerCaptor.capture()); verify(forwarder, never()).unregister(any(), any()); @@ -263,7 +263,8 @@ public class BidirectionalTopicOperationTest { MyStringOperation oper2 = new MyStringOperation(); assertSame(outcome, oper2.processResponse(outcome, TEXT, null)); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + assertEquals(OperationResult.SUCCESS, outcome.getResult()); + assertEquals(TEXT, outcome.getResponse()); } /** @@ -275,7 +276,8 @@ public class BidirectionalTopicOperationTest { MyScoOperation oper2 = new MyScoOperation(); assertSame(outcome, oper2.processResponse(outcome, responseText, stdResponse)); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + assertEquals(OperationResult.SUCCESS, outcome.getResult()); + assertEquals(stdResponse, outcome.getResponse()); } /** @@ -291,7 +293,8 @@ public class BidirectionalTopicOperationTest { stdResponse = coder.decode(responseText, StandardCoderObject.class); assertSame(outcome, oper.processResponse(outcome, responseText, stdResponse)); - assertEquals(PolicyResult.FAILURE, outcome.getResult()); + assertEquals(OperationResult.FAILURE, outcome.getResult()); + assertEquals(resp, outcome.getResponse()); } /** @@ -300,7 +303,8 @@ public class BidirectionalTopicOperationTest { @Test public void testProcessResponseDecodeOk() throws CoderException { assertSame(outcome, oper.processResponse(outcome, responseText, stdResponse)); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + assertEquals(OperationResult.SUCCESS, outcome.getResult()); + assertEquals(response, outcome.getResponse()); } /** @@ -320,8 +324,8 @@ public class BidirectionalTopicOperationTest { } @Test - public void testMakeCoder() { - assertNotNull(oper.makeCoder()); + public void testGetCoder() { + assertNotNull(oper.getCoder()); } /** @@ -330,7 +334,7 @@ public class BidirectionalTopicOperationTest { private void setOperCoderException() { oper = new MyOperation() { @Override - protected Coder makeCoder() { + protected Coder getCoder() { return new StandardCoder() { @Override public String encode(Object object, boolean pretty) throws CoderException { @@ -350,8 +354,9 @@ public class BidirectionalTopicOperationTest { @Getter @Setter + @EqualsAndHashCode public static class MyResponse { - private String requestId = REQ_ID; + private String requestId; private String output; } @@ -359,12 +364,12 @@ public class BidirectionalTopicOperationTest { private class MyStringOperation extends BidirectionalTopicOperation { public MyStringOperation() { - super(BidirectionalTopicOperationTest.this.params, config, String.class); + super(BidirectionalTopicOperationTest.this.params, config, String.class, Collections.emptyList()); } @Override - protected Pair makeRequest(int attempt) { - return Pair.of(SUB_REQID, TEXT); + protected String makeRequest(int attempt) { + return TEXT; } @Override @@ -381,12 +386,13 @@ public class BidirectionalTopicOperationTest { private class MyScoOperation extends BidirectionalTopicOperation { public MyScoOperation() { - super(BidirectionalTopicOperationTest.this.params, config, StandardCoderObject.class); + super(BidirectionalTopicOperationTest.this.params, config, StandardCoderObject.class, + Collections.emptyList()); } @Override - protected Pair makeRequest(int attempt) { - return Pair.of(SUB_REQID, new MyRequest()); + protected MyRequest makeRequest(int attempt) { + return new MyRequest(); } @Override @@ -403,12 +409,12 @@ public class BidirectionalTopicOperationTest { private class MyOperation extends BidirectionalTopicOperation { public MyOperation() { - super(BidirectionalTopicOperationTest.this.params, config, MyResponse.class); + super(BidirectionalTopicOperationTest.this.params, config, MyResponse.class, Collections.emptyList()); } @Override - protected Pair makeRequest(int attempt) { - return Pair.of(SUB_REQID, new MyRequest()); + protected MyRequest makeRequest(int attempt) { + return new MyRequest(); } @Override