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%2Fdatabroker%2Factors%2Fdds%2FAbstractDataStoreClientBehaviorTest.java;h=6528c6ba7c91df095d0962797586e5ceb6566b5e;hb=refs%2Fchanges%2F00%2F84600%2F3;hp=bdba5d13e57379103aecf8e4c9c939ad805ed899;hpb=e1ab83451c10cee6ad3f5e38d7a13c9c7d4501c1;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java index bdba5d13e5..6528c6ba7c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientBehaviorTest.java @@ -71,7 +71,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { @Test public void testResolveShardForPath() { - Assert.assertEquals(0L, behavior.resolveShardForPath(YangInstanceIdentifier.EMPTY).longValue()); + Assert.assertEquals(0L, behavior.resolveShardForPath(YangInstanceIdentifier.empty()).longValue()); } @Test @@ -136,7 +136,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { public void testGetConnection() { //set up data tree mock final CursorAwareDataTreeModification modification = mock(CursorAwareDataTreeModification.class); - when(modification.readNode(YangInstanceIdentifier.EMPTY)).thenReturn(Optional.empty()); + when(modification.readNode(YangInstanceIdentifier.empty())).thenReturn(Optional.empty()); final DataTreeSnapshot snapshot = mock(DataTreeSnapshot.class); when(snapshot.newModification()).thenReturn(modification); final DataTree dataTree = mock(DataTree.class); @@ -144,7 +144,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { final TestProbe backendProbe = new TestProbe(system, "backend"); final long shard = 0L; - behavior.createTransaction().read(YangInstanceIdentifier.EMPTY); + behavior.createTransaction().read(YangInstanceIdentifier.empty()); final AbstractClientConnection connection = behavior.getConnection(shard); //check cached connection for same shard Assert.assertSame(connection, behavior.getConnection(shard)); @@ -160,7 +160,7 @@ public abstract class AbstractDataStoreClientBehaviorTest { final InternalCommand command = clientActorProbe.expectMsgClass(InternalCommand.class); command.execute(behavior); //check, whether command was reaplayed - verify(modification).readNode(YangInstanceIdentifier.EMPTY); + verify(modification).readNode(YangInstanceIdentifier.empty()); } private static ActorUtils createActorContextMock(final ActorSystem system, final ActorRef actor) {