Fix db exception in frankfurt junit

Frankfurt junits were generating the following output:

  Value too long for column "TARGET VARCHAR(50)":
    "'Target [type=VNF, resourceId=bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38]'

The issue turned out to be caused by the fact that the rules for the
new actor were storing the "Target" instead of the "TargetEntity"
in the DB field.  Modified the code to store the target entity, as the
the usecases rules do.

Issue-ID: POLICY-2441
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I91ee517ef073e3dc3fea4698c814b57a06d87095

3 files changed, 24 insertions, 20 deletions

diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java
index e946d2edc..9c2e22d26 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java
@@ -276,7 +276,7 @@ public class ControlLoopOperationManager2Test {
         verify(mgrctx).updated(mgr);
 
         // should not have tried to store anything in the DB
-        verify(dataMgr, never()).store(any(), any(), any());
+        verify(dataMgr, never()).store(any(), any(), any(), any());
     }
 
     @Test
@@ -561,7 +561,7 @@ public class ControlLoopOperationManager2Test {
         assertTrue(mgr.nextStep());
         verify(mgrctx, times(2)).updated(mgr);
 
-        verify(dataMgr, never()).store(any(), any(), any());
+        verify(dataMgr, never()).store(any(), any(), any(), any());
     }
 
     /**
@@ -951,10 +951,13 @@ public class ControlLoopOperationManager2Test {
     }
 
     private void verifyDb(int nrecords, PolicyResult expectedResult, String expectedMsg) {
-        ArgumentCaptor<ControlLoopOperation> captor = ArgumentCaptor.forClass(ControlLoopOperation.class);
-        verify(dataMgr, times(nrecords)).store(any(), any(), captor.capture());
+        ArgumentCaptor<String> entityCaptor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<ControlLoopOperation> opCaptor = ArgumentCaptor.forClass(ControlLoopOperation.class);
+        verify(dataMgr, times(nrecords)).store(any(), any(), entityCaptor.capture(), opCaptor.capture());
 
-        ControlLoopOperation oper = captor.getValue();
+        assertEquals(MY_TARGET, entityCaptor.getValue());
+
+        ControlLoopOperation oper = opCaptor.getValue();
 
         assertEquals(expectedResult.toString(), oper.getOutcome());
         assertEquals(expectedMsg, oper.getMessage());
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImplTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImplTest.java
index 8e3c1fa9b..e6c66d120 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImplTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImplTest.java
@@ -54,6 +54,7 @@ public class OperationHistoryDataManagerImplTest {
 
     private static final IllegalStateException EXPECTED_EXCEPTION = new IllegalStateException("expected exception");
     private static final String MY_TARGET = "my-target";
+    private static final String MY_ENTITY = "my-entity";
     private static final String REQ_ID = "my-request-id";
     private static final int BATCH_SIZE = 5;
     private static final int MAX_QUEUE_LENGTH = 23;
@@ -165,7 +166,7 @@ public class OperationHistoryDataManagerImplTest {
     @Test
     public void testStore_testStop() throws InterruptedException {
         // store
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         runThread();
 
@@ -192,7 +193,7 @@ public class OperationHistoryDataManagerImplTest {
         mgr.stop();
 
         // store
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         assertEquals(0, mgr.getRecordsAdded());
     }
@@ -204,7 +205,7 @@ public class OperationHistoryDataManagerImplTest {
     public void testStoreTooManyItems() throws InterruptedException {
         final int nextra = 5;
         for (int nitems = 0; nitems < MAX_QUEUE_LENGTH + nextra; ++nitems) {
-            mgr.store(REQ_ID, event, operation);
+            mgr.store(REQ_ID, event, MY_ENTITY, operation);
         }
 
         runThread();
@@ -225,9 +226,9 @@ public class OperationHistoryDataManagerImplTest {
         mgr = new RealThread();
         mgr.start();
 
-        mgr.store(REQ_ID, event, operation);
-        mgr.store(REQ_ID, event, operation);
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         waitForThread();
 
@@ -261,9 +262,9 @@ public class OperationHistoryDataManagerImplTest {
         mgr = new RealThread();
         mgr.start();
 
-        mgr.store(REQ_ID, event, operation);
-        mgr.store(REQ_ID, event, operation);
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         waitForThread();
 
@@ -278,7 +279,7 @@ public class OperationHistoryDataManagerImplTest {
         // arrange to throw an exception
         when(emfSpy.createEntityManager()).thenThrow(EXPECTED_EXCEPTION);
 
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         runThread();
     }
@@ -286,22 +287,22 @@ public class OperationHistoryDataManagerImplTest {
     @Test
     public void testStoreRecord() throws InterruptedException {
         // no start time
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         // no start time
         operation = new ControlLoopOperation(operation);
         operation.setStart(Instant.now());
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         // both start and end times
         operation = new ControlLoopOperation(operation);
         operation.setEnd(Instant.now());
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         // only end time
         operation = new ControlLoopOperation(operation);
         operation.setStart(null);
-        mgr.store(REQ_ID, event, operation);
+        mgr.store(REQ_ID, event, MY_ENTITY, operation);
 
         runThread();
 
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerStubTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerStubTest.java
index f4a7ff8c5..a6f50629c 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerStubTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerStubTest.java
@@ -30,7 +30,7 @@ public class OperationHistoryDataManagerStubTest {
     public void test() {
         OperationHistoryDataManagerStub mgr = new OperationHistoryDataManagerStub();
 
-        assertThatCode(() -> mgr.store(null, null, null)).doesNotThrowAnyException();
+        assertThatCode(() -> mgr.store(null, null, null, null)).doesNotThrowAnyException();
         assertThatCode(() -> mgr.stop()).doesNotThrowAnyException();
     }
 }