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%2Fdatabroker%2FClientBackedDataStoreTest.java;h=bf107514809355dbcb2cff65384b083178fe3781;hp=24a58759673f134b6c24f0f020a7f2f0a09caa2d;hb=e46f5ca6e44904d9dd0b69fb8a36ebf69a293496;hpb=ca5129914385dd43bf4c2af2757374878e785979 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedDataStoreTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedDataStoreTest.java index 24a5875967..bf10751480 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedDataStoreTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedDataStoreTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.databroker; -import java.lang.reflect.Field; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -20,7 +19,6 @@ import org.opendaylight.controller.cluster.access.concepts.FrontendType; import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -import org.opendaylight.controller.cluster.databroker.actors.dds.AbstractClientHandle; import org.opendaylight.controller.cluster.databroker.actors.dds.ClientLocalHistory; import org.opendaylight.controller.cluster.databroker.actors.dds.ClientSnapshot; import org.opendaylight.controller.cluster.databroker.actors.dds.ClientTransaction; @@ -69,13 +67,8 @@ public class ClientBackedDataStoreTest { Mockito.when(actorContext.getSchemaContext()).thenReturn(schemaContext); Mockito.when(actorContext.getDatastoreContext()).thenReturn(DatastoreContext.newBuilder().build()); - - final Field transactionIdField = AbstractClientHandle.class.getDeclaredField("transactionId"); - transactionIdField.setAccessible(true); - - // set transaction ids to mocked objects - transactionIdField.set(clientTransaction, TRANSACTION_IDENTIFIER); - transactionIdField.set(clientSnapshot, TRANSACTION_IDENTIFIER); + Mockito.when(clientTransaction.getIdentifier()).thenReturn(TRANSACTION_IDENTIFIER); + Mockito.when(clientSnapshot.getIdentifier()).thenReturn(TRANSACTION_IDENTIFIER); Mockito.when(clientActor.getIdentifier()).thenReturn(CLIENT_IDENTIFIER); Mockito.when(clientActor.createTransaction()).thenReturn(clientTransaction);