From 4377c8e7b1ac67c1fe1699adfd13fc10a3509f1f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 18 Oct 2022 22:23:01 +0200 Subject: [PATCH] Clean up netconf-client tests Remove unneeded throws declarations and do not use mockito internals. Change-Id: If25da046270c1e097f9e24c7e43dbad53720a293 Signed-off-by: Robert Varga --- .../NetconfClientSessionNegotiatorTest.java | 25 ++++++------------- ...impleNetconfClientSessionListenerTest.java | 10 +++----- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java index 5714eb4b6c..b61073d674 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java @@ -38,8 +38,6 @@ import java.util.Optional; import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.mockito.internal.util.collections.Sets; -import org.opendaylight.netconf.api.NetconfDocumentedException; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessage; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -61,8 +59,8 @@ public class NetconfClientSessionNegotiatorTest { private ChannelInboundHandlerAdapter channelInboundHandlerAdapter; @Before - public void setUp() throws Exception { - helloMessage = NetconfHelloMessage.createClientHello(Sets.newSet("exi:1.0"), Optional.empty()); + public void setUp() { + helloMessage = NetconfHelloMessage.createClientHello(Set.of("exi:1.0"), Optional.empty()); pipeline = mockChannelPipeline(); future = mockChannelFuture(); channel = mockChannel(); @@ -152,30 +150,25 @@ public class NetconfClientSessionNegotiatorTest { } @Test - public void testNetconfClientSessionNegotiator() throws NetconfDocumentedException { + public void testNetconfClientSessionNegotiator() throws Exception { Promise promise = mock(Promise.class); doReturn(promise).when(promise).setSuccess(any()); NetconfClientSessionNegotiator negotiator = createNetconfClientSessionNegotiator(promise, null); negotiator.channelActive(null); - Set caps = Sets.newSet("a", "b"); - NetconfHelloMessage helloServerMessage = NetconfHelloMessage.createServerHello(caps, 10); - negotiator.handleMessage(helloServerMessage); + negotiator.handleMessage(NetconfHelloMessage.createServerHello(Set.of("a", "b"), 10)); verify(promise).setSuccess(any()); } @Test public void testNegotiatorWhenChannelActiveHappenAfterHandleMessage() throws Exception { - Promise promise = mock(Promise.class); + Promise promise = mock(Promise.class); doReturn(false).when(promise).isDone(); doReturn(promise).when(promise).setSuccess(any()); NetconfClientSessionNegotiator negotiator = createNetconfClientSessionNegotiator(promise, null); - Set caps = Sets.newSet("a", "b"); - NetconfHelloMessage helloServerMessage = NetconfHelloMessage.createServerHello(caps, 10); - negotiator.handleMessage(helloServerMessage); + negotiator.handleMessage(NetconfHelloMessage.createServerHello(Set.of("a", "b"), 10)); negotiator.channelActive(null); - verify(promise).setSuccess(any()); } @@ -187,8 +180,6 @@ public class NetconfClientSessionNegotiatorTest { NetconfClientSessionNegotiator negotiator = createNetconfClientSessionNegotiator(promise, exiMessage); negotiator.channelActive(null); - Set caps = Sets.newSet("exi:1.0"); - NetconfHelloMessage message = NetconfHelloMessage.createServerHello(caps, 10); doAnswer(invocationOnMock -> { channelInboundHandlerAdapter = invocationOnMock.getArgument(2); @@ -197,7 +188,7 @@ public class NetconfClientSessionNegotiatorTest { ChannelHandlerContext handlerContext = mock(ChannelHandlerContext.class); doReturn(pipeline).when(handlerContext).pipeline(); - negotiator.handleMessage(message); + negotiator.handleMessage(NetconfHelloMessage.createServerHello(Set.of("exi:1.0"), 10)); Document expectedResult = XmlFileLoader.xmlFileToDocument("netconfMessages/rpc-reply_ok.xml"); channelInboundHandlerAdapter.channelRead(handlerContext, new NetconfMessage(expectedResult)); @@ -209,7 +200,7 @@ public class NetconfClientSessionNegotiatorTest { @Test public void testNetconfClientSessionNegotiatorGetCached() throws Exception { - Promise promise = mock(Promise.class); + Promise promise = mock(Promise.class); doReturn(promise).when(promise).setSuccess(any()); NetconfClientSessionListener sessionListener = mock(NetconfClientSessionListener.class); NetconfClientSessionNegotiator negotiator = createNetconfClientSessionNegotiator(promise, null); diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java index 60f3ad89e1..65e1c8e109 100644 --- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java +++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java @@ -24,23 +24,19 @@ import io.netty.util.concurrent.GenericFutureListener; import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.mockito.internal.util.collections.Sets; -import org.opendaylight.netconf.api.NetconfDocumentedException; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessage; public class SimpleNetconfClientSessionListenerTest { - private Channel channel; private ChannelPromise channelFuture; - Set caps; private NetconfHelloMessage helloMessage; private NetconfMessage message; private NetconfClientSessionListener sessionListener; private NetconfClientSession clientSession; @Before - public void setUp() throws NetconfDocumentedException { + public void setUp() { channel = mock(Channel.class); channelFuture = mock(ChannelPromise.class); mockEventLoop(); @@ -48,7 +44,7 @@ public class SimpleNetconfClientSessionListenerTest { doReturn(channelFuture).when(channel).writeAndFlush(any()); doReturn(channelFuture).when(channel).writeAndFlush(any(), any(ChannelPromise.class)); doReturn(channelFuture).when(channelFuture).addListener(any(GenericFutureListener.class)); - caps = Sets.newSet("a", "b"); + final var caps = Set.of("a", "b"); helloMessage = NetconfHelloMessage.createServerHello(caps, 10); message = new NetconfMessage(helloMessage.getDocument()); sessionListener = mock(NetconfClientSessionListener.class); @@ -65,7 +61,7 @@ public class SimpleNetconfClientSessionListenerTest { } @Test - public void testSessionDown() throws Exception { + public void testSessionDown() { SimpleNetconfClientSessionListener simpleListener = new SimpleNetconfClientSessionListener(); final Future promise = simpleListener.sendRequest(message); simpleListener.onSessionUp(clientSession); -- 2.36.6