Bug-6889: BGPCEP Boron Autorelease Breaking

Increased timeout in BmpMockTest using Mockito#timeout
(it waits till timeout only if needed)

Change-Id: I8151757aa29a46c30b674398efeddc711189ac93
Signed-off-by: Ajay <ajayl.bro@gmail.com>

diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
index e4013974324c146a98e10b4f180990182d90d90b..4ba2de627015d076b643d6966ca8154e29cbb0c1 100644 (file)
--- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
+++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
@@ -67,10 +67,9 @@ public class BmpMockTest {
         Channel serverChannel = futureServer.channel();
 
         BmpMock.main(new String[]{"--remote_address", InetSocketAddressUtil.toHostAndPort(serverAddr).toString(), "--peers_count", "3", "--pre_policy_routes", "3"});
-        Thread.sleep(1000);
-        Mockito.verify(this.sessionListener).onSessionUp(Mockito.any(BmpSession.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10))).onSessionUp(Mockito.any(BmpSession.class));
         //1 * Initiate message + 3 * PeerUp Notification + 9 * Route Monitoring message
-        Mockito.verify(this.sessionListener, Mockito.times(13)).onMessage(Mockito.any(Notification.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10)).times(13)).onMessage(Mockito.any(Notification.class));
 
         serverChannel.close().sync();
     }
@@ -87,10 +86,9 @@ public class BmpMockTest {
             bmpSessionListenerFactory, Optional.<KeyMapping>absent());
         waitFutureSuccess(futureServer);
         Channel serverChannel = futureServer.channel();
-        Thread.sleep(1000);
-        Mockito.verify(this.sessionListener).onSessionUp(Mockito.any(BmpSession.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10))).onSessionUp(Mockito.any(BmpSession.class));
         //1 * Initiate message + 3 * PeerUp Notification + 9 * Route Monitoring message
-        Mockito.verify(this.sessionListener, Mockito.times(13)).onMessage(Mockito.any(Notification.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10)).times(13)).onMessage(Mockito.any(Notification.class));
 
         serverChannel.close().sync();
     }