Eliminate use of deprecated mockito methods

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / DataTreeChangeListenerProxyTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java
index 511c3d217910beec950f05a67677ad845b866977..3f5f222febc8b096f4f90b410fd51cf6fca54537 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java
@@ -10,8 +10,8 @@ package org.opendaylight.controller.cluster.datastore;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -26,6 +26,7 @@ import akka.testkit.javadsl.TestKit;
 import akka.util.Timeout;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Uninterruptibles;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.mockito.stubbing.Answer;
@@ -46,7 +47,6 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import scala.concurrent.ExecutionContextExecutor;
 import scala.concurrent.Future;
-import scala.concurrent.duration.FiniteDuration;
 
 public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
     private final DOMDataTreeChangeListener mockListener = mock(DOMDataTreeChangeListener.class);
@@ -63,7 +63,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
 
         new Thread(() -> proxy.init("shard-1")).start();
 
-        FiniteDuration timeout = kit.duration("5 seconds");
+        Duration timeout = Duration.ofSeconds(5);
         FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
         assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
 
@@ -113,7 +113,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
 
         new Thread(() -> proxy.init("shard-1")).start();
 
-        FiniteDuration timeout = kit.duration("5 seconds");
+        Duration timeout = Duration.ofSeconds(5);
         FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
         assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
 
@@ -139,13 +139,13 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
 
         new Thread(() -> proxy.init("shard-1")).start();
 
-        FiniteDuration timeout = kit.duration("5 seconds");
+        Duration timeout = Duration.ofSeconds(5);
         FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
         assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
 
         kit.reply(new LocalShardNotFound("shard-1"));
 
-        kit.expectNoMessage(kit.duration("1 seconds"));
+        kit.expectNoMessage(Duration.ofSeconds(1));
 
         proxy.close();
     }
@@ -162,13 +162,13 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
 
         new Thread(() -> proxy.init("shard-1")).start();
 
-        FiniteDuration timeout = kit.duration("5 seconds");
+        Duration timeout = Duration.ofSeconds(5);
         FindLocalShard findLocalShard = kit.expectMsgClass(timeout, FindLocalShard.class);
         assertEquals("getShardName", "shard-1", findLocalShard.getShardName());
 
         kit.reply(new NotInitializedException("not initialized"));
 
-        kit.within(kit.duration("1 seconds"), () ->  {
+        kit.within(Duration.ofSeconds(1), () ->  {
             kit.expectNoMessage();
             return null;
         });
@@ -238,7 +238,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest {
 
         proxy.init(shardName);
 
-        kit.expectMsgClass(kit.duration("5 seconds"), CloseDataTreeNotificationListenerRegistration.class);
+        kit.expectMsgClass(Duration.ofSeconds(5), CloseDataTreeNotificationListenerRegistration.class);
 
         assertEquals("getListenerRegistrationActor", null, proxy.getListenerRegistrationActor());
     }