Eliminate use of deprecated mockito methods

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/DispatchersTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/DispatchersTest.java
index 85a0cac3daf3c8761fcacf2cb24c1593f741ca8e..8e622b3d6b5c140c81520a220e55bc97eb186a49 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/DispatchersTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/DispatchersTest.java
@@ -1,21 +1,31 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.controller.cluster.datastore.utils;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+
 import akka.dispatch.MessageDispatcher;
 import org.junit.Test;
+import org.opendaylight.controller.cluster.common.actor.Dispatchers;
 
 public class DispatchersTest {
 
     @Test
-    public void testGetDefaultDispatcherPath(){
+    public void testGetDefaultDispatcherPath() {
         akka.dispatch.Dispatchers mockDispatchers = mock(akka.dispatch.Dispatchers.class);
         doReturn(false).when(mockDispatchers).hasDispatcher(anyString());
         Dispatchers dispatchers = new Dispatchers(mockDispatchers);
 
-        for(Dispatchers.DispatcherType type : Dispatchers.DispatcherType.values()) {
+        for (Dispatchers.DispatcherType type : Dispatchers.DispatcherType.values()) {
             assertEquals(Dispatchers.DEFAULT_DISPATCHER_PATH,
                     dispatchers.getDispatcherPath(type));
         }
@@ -23,14 +33,14 @@ public class DispatchersTest {
     }
 
     @Test
-    public void testGetDefaultDispatcher(){
+    public void testGetDefaultDispatcher() {
         akka.dispatch.Dispatchers mockDispatchers = mock(akka.dispatch.Dispatchers.class);
         MessageDispatcher mockGlobalDispatcher = mock(MessageDispatcher.class);
         doReturn(false).when(mockDispatchers).hasDispatcher(anyString());
         doReturn(mockGlobalDispatcher).when(mockDispatchers).defaultGlobalDispatcher();
         Dispatchers dispatchers = new Dispatchers(mockDispatchers);
 
-        for(Dispatchers.DispatcherType type : Dispatchers.DispatcherType.values()) {
+        for (Dispatchers.DispatcherType type : Dispatchers.DispatcherType.values()) {
             assertEquals(mockGlobalDispatcher,
                     dispatchers.getDispatcher(type));
         }
@@ -38,7 +48,7 @@ public class DispatchersTest {
     }
 
     @Test
-    public void testGetDispatcherPath(){
+    public void testGetDispatcherPath() {
         akka.dispatch.Dispatchers mockDispatchers = mock(akka.dispatch.Dispatchers.class);
         doReturn(true).when(mockDispatchers).hasDispatcher(anyString());
         Dispatchers dispatchers = new Dispatchers(mockDispatchers);
@@ -58,7 +68,7 @@ public class DispatchersTest {
     }
 
     @Test
-    public void testGetDispatcher(){
+    public void testGetDispatcher() {
         akka.dispatch.Dispatchers mockDispatchers = mock(akka.dispatch.Dispatchers.class);
         MessageDispatcher mockDispatcher = mock(MessageDispatcher.class);
         doReturn(true).when(mockDispatchers).hasDispatcher(anyString());
@@ -78,4 +88,4 @@ public class DispatchersTest {
                 dispatchers.getDispatcherPath(Dispatchers.DispatcherType.Notification));
 
     }
-}
\ No newline at end of file
+}