X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FAccessClientUtil.java;h=7521ed639e734f03cb27e217f0730bd863f8f51d;hb=2b702880c19e11be077ddcc540aeacd80ecfcaf6;hp=6fdc00734f87dc31c146db06443febf56306d16f;hpb=0d05ea3fd79780e2526d9f049d2500825b629955;p=controller.git

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 6fdc00734f..7521ed639e 100644
--- 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
@@ -22,25 +22,33 @@ import org.opendaylight.controller.cluster.access.concepts.ResponseEnvelope;
 /**
  * Util class to access package private members in cds-access-client for test purposes.
  */
-public class AccessClientUtil {
+public final class AccessClientUtil {
+    private AccessClientUtil() {
+        throw new UnsupportedOperationException();
+    }
 
     public static ClientActorContext createClientActorContext(final ActorSystem system, final ActorRef actor,
                                                               final ClientIdentifier id, final String persistenceId) {
 
-        return spy(new ClientActorContext(actor, system.scheduler(), system.dispatcher(), persistenceId, id,
-                newMockClientActorConfig()));
+        return spy(new ClientActorContext(actor, persistenceId, system, id, newMockClientActorConfig()));
     }
 
     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();
+        doReturn(AbstractClientConnection.DEFAULT_REQUEST_TIMEOUT_NANOS).when(mockConfig).getRequestTimeout();
+        doReturn(AbstractClientConnection.DEFAULT_NO_PROGRESS_TIMEOUT_NANOS)
+                 .when(mockConfig).getNoProgressTimeout();
         return mockConfig;
     }
 
     public static <T extends BackendInfo> ConnectedClientConnection<T> createConnectedConnection(
             final ClientActorContext context, final Long cookie, final T backend) {
-        return new ConnectedClientConnection<>(context, cookie, backend);
+        return new ConnectedClientConnection<>(new ConnectingClientConnection<>(context, cookie, backend.getName()),
+                backend);
     }
 
     public static void completeRequest(final AbstractClientConnection<? extends BackendInfo> connection,