X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Futil%2Fosgi%2FNetconfConfigUtilTest.java;h=a50d7fc61fbbee72e81529970d996bbad0bc2b9f;hp=741d0d24520022cc5ee4cbb997f9140c6d1a1124;hb=b2e81149739c87f0ecc2ce7f06448d7a5d3162b8;hpb=05636effb1e63ca1356c814db6807653fa8575fd diff --git a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java index 741d0d2452..a50d7fc61f 100644 --- a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java +++ b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java @@ -8,20 +8,19 @@ package org.opendaylight.controller.netconf.util.osgi; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + import com.google.common.base.Optional; import io.netty.channel.local.LocalAddress; import java.net.InetSocketAddress; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.netconf.util.NetconfUtil; import org.osgi.framework.BundleContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; - public class NetconfConfigUtilTest { private BundleContext bundleContext; @@ -36,10 +35,10 @@ public class NetconfConfigUtilTest { assertEquals(NetconfConfigUtil.getNetconfLocalAddress(), new LocalAddress("netconf")); doReturn("").when(bundleContext).getProperty("netconf.connectionTimeoutMillis"); - assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), 5000); + assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), NetconfConfigUtil.DEFAULT_TIMEOUT_MILLIS); doReturn("a").when(bundleContext).getProperty("netconf.connectionTimeoutMillis"); - assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), 5000); + assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), NetconfConfigUtil.DEFAULT_TIMEOUT_MILLIS); } @Test