Reduce use of waitFutureSuccess utility

[bgpcep.git] / bmp / bmp-mock / src / test / java / org / opendaylight / protocol / bmp / mock / BmpMockTest.java

diff --git a/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java b/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
index f5b42957c3791119fb8534713c8701f5cc24a80c..b7333a5ea7adeb5f07d6fa1c52f21bed844f199f 100644 (file)
--- a/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
+++ b/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
@@ -9,7 +9,6 @@
 package org.opendaylight.protocol.bmp.mock;
 
 import static org.mockito.Mockito.verify;
-import static org.opendaylight.protocol.util.CheckUtil.waitFutureSuccess;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -58,7 +57,7 @@ public class BmpMockTest {
         this.bmpDispatcher.close();
     }
 
-    @Test
+    @Test(timeout = 20000)
     public void testMain() throws Exception {
         final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();
         final BmpSessionListenerFactory bmpSessionListenerFactory = () -> BmpMockTest.this.sessionListener;
@@ -94,7 +93,7 @@ public class BmpMockTest {
         }
     }
 
-    @Test
+    @Test(timeout = 20000)
     public void testMainInPassiveMode() throws Exception {
         final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();
         final BmpSessionListenerFactory bmpSessionListenerFactory = () -> BmpMockTest.this.sessionListener;
@@ -104,7 +103,7 @@ public class BmpMockTest {
             "--peers_count", "3", "--pre_policy_routes", "3", "--passive"});
         final ChannelFuture futureServer = this.bmpDispatcher.createClient(serverAddr,
                 bmpSessionListenerFactory, KeyMapping.getKeyMapping());
-        waitFutureSuccess(futureServer);
+        futureServer.sync();
         final Channel serverChannel;
         final int sessionUpWait;
         if (futureServer.isSuccess()) {