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%2FOperationPartialTest.java;h=72a7338d55a9a8a35016db4d8e5be9985cb5e9d7;hb=1dd41890f83702d47c5a957493046433989ef36c;hp=b7a6a1d3bfb8cd9ebce53954684808318c7aa98d;hpb=ca468c57a4d09842f2608e32da74b30eba52d015;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java index b7a6a1d3b..72a7338d5 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java @@ -165,7 +165,7 @@ public class OperationPartialTest { params = ControlLoopOperationParams.builder().completeCallback(this::completer).requestId(REQ_ID) .executor(executor).actorService(service).actor(ACTOR).operation(OPERATION).timeoutSec(TIMEOUT) - .startCallback(this::starter).targetEntity(MY_TARGET_ENTITY).build(); + .startCallback(this::starter).build(); when(service.getActor(OperationPartial.GUARD_ACTOR_NAME)).thenReturn(guardActor); when(guardActor.getOperator(OperationPartial.GUARD_OPERATION_NAME)).thenReturn(guardOperator); @@ -923,6 +923,12 @@ public class OperationPartialTest { } } + @Test + public void testMakeOutcome() { + oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, MY_TARGET_ENTITY); + assertEquals(MY_TARGET_ENTITY, oper.makeOutcome().getTarget()); + } + @Test public void testIsTimeout() { final TimeoutException timex = new TimeoutException(EXPECTED_EXCEPTION); @@ -1006,16 +1012,6 @@ public class OperationPartialTest { assertEquals(OperationPartial.DEFAULT_RETRY_WAIT_MS, oper2.getRetryWaitMs()); } - @Test - public void testGetTargetEntity() { - // get it from the params - assertEquals(MY_TARGET_ENTITY, oper.getTargetEntity()); - - // now get it from the properties - oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, "entityX"); - assertEquals("entityX", oper.getTargetEntity()); - } - @Test public void testGetTimeOutMs() { assertEquals(TIMEOUT * 1000, oper.getTimeoutMs(params.getTimeoutSec()));