X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Flistener%2FNetconfDeviceCommunicatorTest.java;h=0771258da80e7af34ef99909bcabba8e7ce258dc;hb=587f3257393e79c720f88d41b8f3f65a600d32df;hp=da24dd0e5107c3cc693b3124ba37ff45da5ca5ba;hpb=9c56fbbb1c62243df9baa3b95140153f91ffdde9;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java index da24dd0e51..0771258da8 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.sal.connect.netconf.listener; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -50,20 +50,20 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.config.util.xml.XmlMappingConstants; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.client.NetconfClientDispatcherImpl; import org.opendaylight.netconf.client.NetconfClientSession; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration; import org.opendaylight.netconf.client.conf.NetconfReconnectingClientConfiguration; import org.opendaylight.netconf.client.conf.NetconfReconnectingClientConfigurationBuilder; -import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.LoginPassword; +import org.opendaylight.netconf.nettyutil.ReconnectStrategy; +import org.opendaylight.netconf.nettyutil.TimedReconnectStrategy; +import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.LoginPasswordHandler; import org.opendaylight.netconf.sal.connect.api.RemoteDevice; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; -import org.opendaylight.protocol.framework.ReconnectStrategy; -import org.opendaylight.protocol.framework.TimedReconnectStrategy; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcError; @@ -115,11 +115,11 @@ public class NetconfDeviceCommunicatorTest { ChannelFuture mockChannelFuture = mock(ChannelFuture.class); doReturn(mockChannelFuture).when(mockChannelFuture) - .addListener(any((GenericFutureListener.class))); + .addListener(any(GenericFutureListener.class)); doReturn(mockChannelFuture).when(mockSession).sendMessage(same(message)); ListenableFuture> resultFuture = - communicator.sendRequest(message, QName.create("mock rpc")); + communicator.sendRequest(message, QName.create("", "mockRpc")); if (doLastTest) { assertNotNull("ListenableFuture is null", resultFuture); } @@ -210,7 +210,7 @@ public class NetconfDeviceCommunicatorTest { setupSession(); NetconfMessage message = new NetconfMessage(UntrustedXML.newDocumentBuilder().newDocument()); - QName rpc = QName.create("mock rpc"); + QName rpc = QName.create("", "mockRpc"); ArgumentCaptor futureListener = ArgumentCaptor.forClass(GenericFutureListener.class); @@ -241,7 +241,7 @@ public class NetconfDeviceCommunicatorTest { @Test public void testSendRequestWithNoSession() throws Exception { NetconfMessage message = new NetconfMessage(UntrustedXML.newDocumentBuilder().newDocument()); - QName rpc = QName.create("mock rpc"); + QName rpc = QName.create("", "mockRpc"); ListenableFuture> resultFuture = communicator.sendRequest(message, rpc); @@ -257,7 +257,7 @@ public class NetconfDeviceCommunicatorTest { throws ParserConfigurationException { Document doc = UntrustedXML.newDocumentBuilder().newDocument(); Element rpcReply = - doc.createElementNS(URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0, XmlMappingConstants.RPC_REPLY_KEY); + doc.createElementNS(URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0, XmlNetconfConstants.RPC_REPLY_KEY); rpcReply.setAttribute("message-id", messageID); Element element = doc.createElementNS("ns", "data"); element.setTextContent(messageID); @@ -273,7 +273,7 @@ public class NetconfDeviceCommunicatorTest { setupSession(); NetconfMessage message = new NetconfMessage(UntrustedXML.newDocumentBuilder().newDocument()); - QName rpc = QName.create("mock rpc"); + QName rpc = QName.create("", "mockRpc"); ArgumentCaptor futureListener = ArgumentCaptor.forClass(GenericFutureListener.class); @@ -355,10 +355,8 @@ public class NetconfDeviceCommunicatorTest { String errorInfo = rpcError.getInfo(); assertNotNull("RpcError info is null", errorInfo); - assertEquals("Error info contains \"foo\"", true, - errorInfo.contains("foo")); - assertEquals("Error info contains \"bar\"", true, - errorInfo.contains("bar")); + assertTrue("Error info contains \"foo\"", errorInfo.contains("foo")); + assertTrue("Error info contains \"bar\"", errorInfo.contains("bar")); } /** @@ -397,7 +395,7 @@ public class NetconfDeviceCommunicatorTest { .withAddress(new InetSocketAddress("localhost", 65000)) .withReconnectStrategy(reconnectStrategy) .withConnectStrategyFactory(() -> reconnectStrategy) - .withAuthHandler(new LoginPassword("admin", "admin")) + .withAuthHandler(new LoginPasswordHandler("admin", "admin")) .withConnectionTimeoutMillis(10000) .withProtocol(NetconfClientConfiguration.NetconfClientProtocol.SSH) .withSessionListener(listener) @@ -424,15 +422,12 @@ public class NetconfDeviceCommunicatorTest { RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), RpcError.ErrorType.PROTOCOL, "bad-attribute"); - assertEquals("RpcError message non-empty", true, - !Strings.isNullOrEmpty(rpcError.getMessage())); + assertFalse("RpcError message non-empty", Strings.isNullOrEmpty(rpcError.getMessage())); String errorInfo = rpcError.getInfo(); assertNotNull("RpcError info is null", errorInfo); - assertEquals("Error info contains \"actual-message-id\"", true, - errorInfo.contains("actual-message-id")); - assertEquals("Error info contains \"expected-message-id\"", true, - errorInfo.contains("expected-message-id")); + assertTrue("Error info contains \"actual-message-id\"", errorInfo.contains("actual-message-id")); + assertTrue("Error info contains \"expected-message-id\"", errorInfo.contains("expected-message-id")); } @Test @@ -478,7 +473,7 @@ public class NetconfDeviceCommunicatorTest { private static void verifyResponseMessage(final RpcResult rpcResult, final String dataText) { assertNotNull("RpcResult is null", rpcResult); - assertEquals("isSuccessful", true, rpcResult.isSuccessful()); + assertTrue("isSuccessful", rpcResult.isSuccessful()); NetconfMessage messageResult = rpcResult.getResult(); assertNotNull("getResult", messageResult); // List> nodes = messageResult.getSimpleNodesByName( @@ -491,7 +486,7 @@ public class NetconfDeviceCommunicatorTest { private static RpcError verifyErrorRpcResult(final RpcResult rpcResult, final RpcError.ErrorType expErrorType, final String expErrorTag) { assertNotNull("RpcResult is null", rpcResult); - assertEquals("isSuccessful", false, rpcResult.isSuccessful()); + assertFalse("isSuccessful", rpcResult.isSuccessful()); assertNotNull("RpcResult errors is null", rpcResult.getErrors()); assertEquals("Errors size", 1, rpcResult.getErrors().size()); RpcError rpcError = rpcResult.getErrors().iterator().next(); @@ -502,7 +497,7 @@ public class NetconfDeviceCommunicatorTest { final String msg = rpcError.getMessage(); assertNotNull("getMessage is null", msg); assertFalse("getMessage is empty", msg.isEmpty()); - assertFalse("getMessage is blank", CharMatcher.WHITESPACE.matchesAllOf(msg)); + assertFalse("getMessage is blank", CharMatcher.whitespace().matchesAllOf(msg)); return rpcError; } }