From a8af78641afbc7af25f78e6c60b1a40475758cec Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 2 Mar 2020 23:43:06 -0500 Subject: BidirectionalTopic should use plain TopicSink BidirectionalTopicClient use plain TopicSink instead of TopicSinkClient, because the latter encodes its message, while BidirectionalTopicClient should not, because encoding should be left up to the user of the class. Issue-ID: POLICY-1625 Signed-off-by: Jim Hahn Change-Id: I6c67e1ee0c56e96a0efcc90eaf1c0a940902e8b3 --- .../endpoints/event/comm/client/BidirectionalTopicClientTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm') diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClientTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClientTest.java index 9b1018d0..3f0a002c 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClientTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClientTest.java @@ -33,7 +33,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Arrays; -import java.util.Map; import java.util.Properties; import org.junit.AfterClass; import org.junit.Before; @@ -111,7 +110,6 @@ public class BidirectionalTopicClientTest { @Test public void testBidirectionalTopicClient_testGetters() { - assertNotNull(client.getSinkClient()); assertSame(sink, client.getSink()); assertSame(source, client.getSource()); assertEquals(SINK_TOPIC, client.getSinkTopic()); @@ -127,7 +125,7 @@ public class BidirectionalTopicClientTest { public void testBidirectionalTopicClientExceptions() { assertThatThrownBy(() -> new BidirectionalTopicClient2("unknown-sink", SOURCE_TOPIC)) .isInstanceOf(BidirectionalTopicClientException.class) - .hasCauseInstanceOf(TopicSinkClientException.class); + .hasMessage("no sinks for topic: unknown-sink"); assertThatThrownBy(() -> new BidirectionalTopicClient2(SINK_TOPIC, "unknown-source")) .isInstanceOf(BidirectionalTopicClientException.class) @@ -146,8 +144,8 @@ public class BidirectionalTopicClientTest { */ @Test public void testDelegates() { - assertTrue(client.send(Map.of("outgoing", "outgoing-text"))); - verify(sink).send("{\"outgoing\":\"outgoing-text\"}"); + assertTrue(client.send("hello")); + verify(sink).send("hello"); assertTrue(client.offer("incoming")); verify(source).offer("incoming"); -- cgit 1.2.3-korg