Rework NETCONF client reconnection

[netconf.git] / protocol / netconf-client / src / test / java / org / opendaylight / netconf / client / NetconfClientConfigurationTest.java

diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java
index 46b2bfd38cb36f1cc0794058d43e09b36faca847..033bc4b8b9a1c73274c96e033028d0bf1e8c707d 100644 (file)
--- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java
+++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java
@@ -5,18 +5,17 @@
  * 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.client;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.net.InetSocketAddress;
 import java.util.Optional;
-import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.Mockito;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader;
 import org.opendaylight.netconf.client.conf.NetconfClientConfiguration;
 import org.opendaylight.netconf.client.conf.NetconfClientConfigurationBuilder;
-import org.opendaylight.netconf.nettyutil.ReconnectStrategy;
 import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler;
 
 public class NetconfClientConfigurationTest {
@@ -27,41 +26,36 @@ public class NetconfClientConfigurationTest {
                 new NetconfHelloMessageAdditionalHeader("a", "host", "port", "trans", "id");
         NetconfClientSessionListener listener = new SimpleNetconfClientSessionListener();
         InetSocketAddress address = InetSocketAddress.createUnresolved("host", 830);
-        ReconnectStrategy strategy = Mockito.mock(ReconnectStrategy.class);
-        AuthenticationHandler handler = Mockito.mock(AuthenticationHandler.class);
+        AuthenticationHandler handler = mock(AuthenticationHandler.class);
         NetconfClientConfiguration cfg = NetconfClientConfigurationBuilder.create()
                 .withProtocol(NetconfClientConfiguration.NetconfClientProtocol.SSH)
                 .withAddress(address)
                 .withConnectionTimeoutMillis(timeout)
-                .withReconnectStrategy(strategy)
                 .withAdditionalHeader(header)
                 .withSessionListener(listener)
                 .withAuthHandler(handler).build();
 
-        Assert.assertEquals(timeout, cfg.getConnectionTimeoutMillis());
-        Assert.assertEquals(Optional.of(header), cfg.getAdditionalHeader());
-        Assert.assertEquals(listener, cfg.getSessionListener());
-        Assert.assertEquals(handler, cfg.getAuthHandler());
-        Assert.assertEquals(strategy, cfg.getReconnectStrategy());
-        Assert.assertEquals(NetconfClientConfiguration.NetconfClientProtocol.SSH, cfg.getProtocol());
-        Assert.assertEquals(address, cfg.getAddress());
+        assertEquals(timeout, cfg.getConnectionTimeoutMillis());
+        assertEquals(Optional.of(header), cfg.getAdditionalHeader());
+        assertEquals(listener, cfg.getSessionListener());
+        assertEquals(handler, cfg.getAuthHandler());
+        assertEquals(NetconfClientConfiguration.NetconfClientProtocol.SSH, cfg.getProtocol());
+        assertEquals(address, cfg.getAddress());
 
-        SslHandlerFactory sslHandlerFactory = Mockito.mock(SslHandlerFactory.class);
+        SslHandlerFactory sslHandlerFactory = mock(SslHandlerFactory.class);
         NetconfClientConfiguration cfg2 = NetconfClientConfigurationBuilder.create()
                 .withProtocol(NetconfClientConfiguration.NetconfClientProtocol.TLS)
                 .withAddress(address)
                 .withConnectionTimeoutMillis(timeout)
-                .withReconnectStrategy(strategy)
                 .withAdditionalHeader(header)
                 .withSessionListener(listener)
                 .withSslHandlerFactory(sslHandlerFactory).build();
 
-        Assert.assertEquals(timeout, cfg2.getConnectionTimeoutMillis());
-        Assert.assertEquals(Optional.of(header), cfg2.getAdditionalHeader());
-        Assert.assertEquals(listener, cfg2.getSessionListener());
-        Assert.assertEquals(sslHandlerFactory, cfg2.getSslHandlerFactory());
-        Assert.assertEquals(strategy, cfg2.getReconnectStrategy());
-        Assert.assertEquals(NetconfClientConfiguration.NetconfClientProtocol.TLS, cfg2.getProtocol());
-        Assert.assertEquals(address, cfg2.getAddress());
+        assertEquals(timeout, cfg2.getConnectionTimeoutMillis());
+        assertEquals(Optional.of(header), cfg2.getAdditionalHeader());
+        assertEquals(listener, cfg2.getSessionListener());
+        assertEquals(sslHandlerFactory, cfg2.getSslHandlerFactory());
+        assertEquals(NetconfClientConfiguration.NetconfClientProtocol.TLS, cfg2.getProtocol());
+        assertEquals(address, cfg2.getAddress());
     }
 }