From f3fe0b63bc3bf7efdfce815bf17034291f8ff265 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 20 Mar 2020 15:53:47 -0400 Subject: Bug fixes in models simulators Fixed these issues: - topics weren't started - appc topics were reversed - prevent appc simulator from responding to a response (i.e., infinite loop) Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn Change-Id: I1f43be72d35f874fec98f48f1a112c055c00eee5 --- .../policy/simulators/AppcLegacyTopicServerTest.java | 18 +++++++++++++++++- .../org/onap/policy/simulators/TopicServerTest.java | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) (limited to 'models-interactions/model-simulators/src/test/java') diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java index 57d574a0b..c3c3195df 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java @@ -22,6 +22,8 @@ package org.onap.policy.simulators; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import org.junit.Before; @@ -55,7 +57,7 @@ public class AppcLegacyTopicServerTest { } @Test - public void testProcessAppcLcmDmaapWrapper() { + public void testProcess() { String request = ResourceUtils.getResourceAsString("org/onap/policy/simulators/appc/appc.legacy.request.json"); assertNotNull(request); @@ -66,4 +68,18 @@ public class AppcLegacyTopicServerTest { assertThat(respCaptor.getValue()).contains("111be3d2").doesNotContain("replaceMe"); } + + /** + * Tests process() when the message is a response. + */ + @Test + public void testProcessNoResponse() { + // NOTE: this json file is a RESPONSE, not a request + String request = ResourceUtils.getResourceAsString("org/onap/policy/simulators/appc/appc.legacy.success.json"); + assertNotNull(request); + + server.onTopicEvent(CommInfrastructure.NOOP, MY_TOPIC, request); + + verify(sink, never()).send(any()); + } } diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java index 6e176423e..11a5e3f81 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java @@ -85,6 +85,23 @@ public class TopicServerTest { verify(sink, never()).send(any()); } + /** + * Tests onTopicEvent() when there is no response. + */ + @Test + public void testOnTopicEventNoResponse() { + server = new MyServer() { + @Override + protected String process(MyRequest request) { + return null; + } + }; + + server.onTopicEvent(CommInfrastructure.NOOP, MY_TOPIC, "{\"text\": \"bye-bye\"}"); + + verify(sink, never()).send(any()); + } + private class MyRequest { private String text; -- cgit 1.2.3-korg