Remove targetEntity from makeOutcome

[policy/models.git] / models-interactions / model-actors / actorServiceProvider / src / test / java / org / onap / policy / controlloop / actorserviceprovider / parameters / ControlLoopOperationParamsTest.java

diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParamsTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParamsTest.java
index b6bd50c..3390451 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParamsTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParamsTest.java
@@ -61,7 +61,6 @@ public class ControlLoopOperationParamsTest {
     private static final String EXPECTED_EXCEPTION = "expected exception";
     private static final String ACTOR = "my-actor";
     private static final String OPERATION = "my-operation";
-    private static final String TARGET_ENTITY = "my-target";
     private static final Integer RETRY = 3;
     private static final Integer TIMEOUT = 100;
     private static final UUID REQ_ID = UUID.randomUUID();
@@ -112,10 +111,10 @@ public class ControlLoopOperationParamsTest {
 
         params = ControlLoopOperationParams.builder().actorService(actorService).completeCallback(completer)
                         .requestId(REQ_ID).executor(executor).actor(ACTOR).operation(OPERATION).payload(payload)
-                        .retry(RETRY).targetEntity(TARGET_ENTITY).timeoutSec(TIMEOUT)
-                        .startCallback(starter).preprocessed(true).build();
+                        .retry(RETRY).timeoutSec(TIMEOUT)
+                        .startCallback(starter).build();
 
-        outcome = params.makeOutcome(TARGET_ENTITY);
+        outcome = params.makeOutcome();
     }
 
     @Test
@@ -141,16 +140,11 @@ public class ControlLoopOperationParamsTest {
     public void testMakeOutcome() {
         assertEquals(ACTOR, outcome.getActor());
         assertEquals(OPERATION, outcome.getOperation());
-        checkRemainingFields("with actor");
-    }
-
-    protected void checkRemainingFields(String testName) {
-        assertEquals(testName, TARGET_ENTITY, outcome.getTarget());
-        assertNull(testName, outcome.getStart());
-        assertNull(testName, outcome.getEnd());
-        assertNull(testName, outcome.getSubRequestId());
-        assertNotNull(testName, outcome.getResult());
-        assertNull(testName, outcome.getMessage());
+        assertNull(outcome.getStart());
+        assertNull(outcome.getEnd());
+        assertNull(outcome.getSubRequestId());
+        assertNotNull(outcome.getResult());
+        assertNull(outcome.getMessage());
     }
 
     @Test
@@ -212,7 +206,7 @@ public class ControlLoopOperationParamsTest {
         testValidate("requestId", NULL_MSG, bldr -> bldr.requestId(null));
 
         // has no target entity
-        BeanValidationResult result = params.toBuilder().targetEntity(null).build().validate();
+        BeanValidationResult result = params.toBuilder().build().validate();
         assertTrue(result.isValid());
 
         // check edge cases
@@ -224,7 +218,7 @@ public class ControlLoopOperationParamsTest {
 
         // test with minimal fields
         assertTrue(ControlLoopOperationParams.builder().actorService(actorService).requestId(REQ_ID).actor(ACTOR)
-                        .operation(OPERATION).targetEntity(TARGET_ENTITY).build().validate().isValid());
+                        .operation(OPERATION).build().validate().isValid());
     }
 
     private void testValidate(String fieldName, String expected,
@@ -276,14 +270,6 @@ public class ControlLoopOperationParamsTest {
         assertNull(ControlLoopOperationParams.builder().build().getPayload());
     }
 
-    @Test
-    public void test() {
-        assertTrue(params.isPreprocessed());
-
-        // should be false when unspecified
-        assertFalse(ControlLoopOperationParams.builder().build().isPreprocessed());
-    }
-
     @Test
     public void testGetRetry() {
         assertSame(RETRY, params.getRetry());
@@ -312,9 +298,4 @@ public class ControlLoopOperationParamsTest {
     public void testGetCompleteCallback() {
         assertSame(completer, params.getCompleteCallback());
     }
-
-    @Test
-    public void testGetTargetEntity() {
-        assertEquals(TARGET_ENTITY, params.getTargetEntity());
-    }
 }