X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractShardTest.java;h=163c15baf6c09f23d3b11a6fc7ccf243a04f2871;hp=3b6625f15a1f9db9d2211c871ed69874ba52c72b;hb=20e100c1377799a60976c4153e4f664578896cb9;hpb=892a6ca966046fd790bdf8a64dccb456a3ece8b4 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java index 3b6625f15a..163c15baf6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java @@ -301,7 +301,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{ String transactionID, short version, boolean doCommitOnReady) { return new ForwardedReadyTransaction(transactionID, version, new ReadWriteShardDataTreeTransaction(newShardDataTreeTransactionParent(cohort), transactionID, - mock(DataTreeModification.class)), true, doCommitOnReady); + mock(DataTreeModification.class)), doCommitOnReady); } protected Object prepareReadyTransactionMessage(boolean remoteReadWriteTransaction, Shard shard, ShardDataTreeCohort cohort, @@ -447,7 +447,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{ final DataTreeCandidateNode mockCandidateNode = mock(DataTreeCandidateNode.class, name + "-node"); doReturn(ModificationType.WRITE).when(mockCandidateNode).getModificationType(); doReturn(Optional.of(ImmutableNodes.containerNode(CarsModel.CARS_QNAME))).when(mockCandidateNode).getDataAfter(); - doReturn(YangInstanceIdentifier.builder().build()).when(mockCandidate).getRootPath(); + doReturn(CarsModel.BASE_PATH).when(mockCandidate).getRootPath(); doReturn(mockCandidateNode).when(mockCandidate).getRootNode(); return mockCandidate; }