Delete preprocessed flag from actors

[policy/models.git] / models-interactions / model-actors / actor.test / src / test / java / org / onap / policy / controlloop / actor / test / BasicOperationTest.java

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 ee0e5ce..758acf7 100644 (file)
--- 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
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 import org.junit.Before;
@@ -42,13 +41,13 @@ public class BasicOperationTest {
 
     @Before
     public void setUp() throws Exception {
-        oper = new BasicHttpOperation<>(ACTOR, OPERATION);
-        oper.setUp();
+        oper = new BasicHttpOperation(ACTOR, OPERATION);
+        oper.setUpBasic();
     }
 
     @Test
     public void testBasicHttpOperation() {
-        oper = new BasicHttpOperation<>();
+        oper = new BasicHttpOperation();
         assertEquals(BasicHttpOperation.DEFAULT_ACTOR, oper.actorName);
         assertEquals(BasicHttpOperation.DEFAULT_OPERATION, oper.operationName);
     }
@@ -62,7 +61,6 @@ public class BasicOperationTest {
     @Test
     public void testSetUp() throws Exception {
         assertNotNull(oper.future);
-        assertNotNull(oper.context);
         assertNotNull(oper.outcome);
         assertNotNull(oper.executor);
     }
@@ -71,24 +69,15 @@ public class BasicOperationTest {
     public void testMakeContext() {
         oper.makeContext();
 
-        assertTrue(oper.enrichment.isEmpty());
-
-        assertSame(BasicHttpOperation.REQ_ID, oper.event.getRequestId());
-        assertSame(oper.enrichment, oper.event.getAai());
-
-        assertSame(oper.event, oper.context.getEvent());
-
-        assertSame(oper.context, oper.params.getContext());
         assertSame(oper.service, oper.params.getActorService());
         assertSame(oper.executor, oper.params.getExecutor());
         assertEquals(ACTOR, oper.params.getActor());
         assertEquals(OPERATION, oper.params.getOperation());
-        assertEquals(BasicHttpOperation.TARGET_ENTITY, oper.params.getTargetEntity());
+        assertSame(BasicHttpOperation.REQ_ID, oper.params.getRequestId());
     }
 
     @Test
-    public void testMakeEnrichment_testMakePayload() {
-        assertTrue(oper.makeEnrichment().isEmpty());
+    public void testMakePayload() {
         assertNull(oper.makePayload());
     }