Merge "Updated handling of ack messages"

2 files changed, 2 insertions, 16 deletions

diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java
index df9a4b259..699df25e8 100644
--- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java
+++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java
@@ -161,21 +161,7 @@ class ParticipantMessagesTest {
 
     @Test
     void testParticipantStatusHeartbeat() throws Exception {
-        final ParticipantStatus heartbeat = new ParticipantStatus();
-        heartbeat.setParticipantId(getParticipantId());
-        ControlLoopInfo clInfo = getControlLoopInfo(getControlLoopId());
-        clInfo.setControlLoopId(getControlLoopId());
-        heartbeat.setControlLoopInfoList(List.of(clInfo));
-
-        ControlLoopElementDefinition clDefinition = getClElementDefinition();
-        List<ControlLoopElementDefinition> controlLoopElementDefinitionList =
-            List.of(clDefinition);
-        ParticipantDefinition participantDefinition = new ParticipantDefinition();
-        participantDefinition.setParticipantId(getParticipantId());
-        participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList);
-        List<ParticipantDefinition> participantDefinitionUpdates = List.of(participantDefinition);
-        heartbeat.setParticipantDefinitionUpdates(participantDefinitionUpdates);
-
+        final ParticipantStatus heartbeat = participantHandler.makeHeartbeat(true);
         synchronized (lockit) {
             ParticipantMessagePublisher publisher =
                     new ParticipantMessagePublisher(Collections.singletonList(Mockito.mock(TopicSink.class)));
diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java
index 5984cf149..4c87e0875 100644
--- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java
+++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java
@@ -59,7 +59,7 @@ public class TestListenerUtils {
     private static final Coder CODER = new StandardCoder();
     static CommonTestData commonTestData = new CommonTestData();
     private static final Logger LOGGER = LoggerFactory.getLogger(TestListenerUtils.class);
-    private static final String CONTROL_LOOP_ELEMENT = "ControlLoopElement";
+    private static final String CONTROL_LOOP_ELEMENT = "org.onap.policy.clamp.controlloop.ControlLoopElement";
 
     private TestListenerUtils() {}