X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fsharding%2FCDSShardAccessImplTest.java;h=3c7e8cd187628b845bc1c9b8b6db09ff70355d55;hb=66e553f2098ea61426c4a441be57395673535c2f;hp=ebd5e701ea9e95c3ef874a58da112882e192cda6;hpb=2fd1fa721510a30f58b3bc277deb05fce58badd6;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java
index ebd5e701ea..3c7e8cd187 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/CDSShardAccessImplTest.java
@@ -21,14 +21,14 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import akka.actor.ActorRef;
 import akka.dispatch.Futures;
-import com.google.common.base.Optional;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
 import org.opendaylight.controller.cluster.datastore.DatastoreContext;
 import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocation;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocationListener;
 import org.opendaylight.controller.cluster.dom.api.LeaderLocationListenerRegistration;
@@ -45,11 +45,11 @@ public class CDSShardAccessImplTest extends AbstractActorTest {
             new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, TestModel.TEST_PATH);
 
     private CDSShardAccessImpl shardAccess;
-    private ActorContext context;
+    private ActorUtils context;
 
     @Before
     public void setUp() {
-        context = mock(ActorContext.class);
+        context = mock(ActorUtils.class);
         final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build();
         doReturn(Optional.of(getSystem().deadLetters())).when(context).findLocalShard(any());
         doReturn(datastoreContext).when(context).getDatastoreContext();