Clean up use of MockitoAnnotations.initMocks

[controller.git] / opendaylight / md-sal / cds-access-client / src / test / java / org / opendaylight / controller / cluster / access / client / AccessClientUtil.java

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AccessClientUtil.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AccessClientUtil.java
index 7521ed639e734f03cb27e217f0730bd863f8f51d..a19fbfee9fb8578e3aed51b33874f5f1e0c15c65 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AccessClientUtil.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AccessClientUtil.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.cluster.access.client;
 
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
@@ -35,13 +36,13 @@ public final class AccessClientUtil {
 
     public static ClientActorConfig newMockClientActorConfig() {
         ClientActorConfig mockConfig = mock(ClientActorConfig.class);
-        doReturn(2_000_000).when(mockConfig).getMaximumMessageSliceSize();
-        doReturn(1_000_000_000).when(mockConfig).getFileBackedStreamingThreshold();
-        doReturn(AbstractClientConnection.DEFAULT_BACKEND_ALIVE_TIMEOUT_NANOS)
-                .when(mockConfig).getBackendAlivenessTimerInterval();
+        lenient().doReturn(2_000_000).when(mockConfig).getMaximumMessageSliceSize();
+        lenient().doReturn(1_000_000_000).when(mockConfig).getFileBackedStreamingThreshold();
         doReturn(AbstractClientConnection.DEFAULT_REQUEST_TIMEOUT_NANOS).when(mockConfig).getRequestTimeout();
-        doReturn(AbstractClientConnection.DEFAULT_NO_PROGRESS_TIMEOUT_NANOS)
-                 .when(mockConfig).getNoProgressTimeout();
+        lenient().doReturn(AbstractClientConnection.DEFAULT_BACKEND_ALIVE_TIMEOUT_NANOS)
+            .when(mockConfig).getBackendAlivenessTimerInterval();
+        lenient().doReturn(AbstractClientConnection.DEFAULT_NO_PROGRESS_TIMEOUT_NANOS)
+            .when(mockConfig).getNoProgressTimeout();
         return mockConfig;
     }