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%2FClientBackedWriteTransactionTest.java;h=21ef8967aecaa2c3d512cbb48146eec01c7c3798;hb=refs%2Fchanges%2F61%2F96761%2F2;hp=4a6ee3f944b63b869d8e3d136129da799c4b5e43;hpb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
index 4a6ee3f944..21ef8967ae 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
@@ -7,24 +7,28 @@
  */
 package org.opendaylight.controller.cluster.databroker;
 
-import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.controller.cluster.databroker.actors.dds.ClientTransaction;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTest<ClientBackedWriteTransaction> {
     private ClientBackedWriteTransaction object;
 
     @Mock
     private ClientTransaction delegate;
     @Mock
-    private NormalizedNode<?, ?> data;
+    private NormalizedNode data;
     @Mock
     private YangInstanceIdentifier path;
     @Mock
@@ -32,10 +36,8 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        Mockito.doReturn(TRANSACTION_ID).when(delegate).getIdentifier();
-        Mockito.doReturn(readyCohort).when(delegate).ready();
+        doReturn(TRANSACTION_ID).when(delegate).getIdentifier();
+        doReturn(readyCohort).when(delegate).ready();
 
         object = new ClientBackedWriteTransaction(delegate, null);
     }
@@ -48,25 +50,25 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes
     @Test
     public void testWrite() {
         object().write(path, data);
-        Mockito.verify(delegate).write(path, data);
+        verify(delegate).write(path, data);
     }
 
     @Test
     public void testMerge() {
         object().merge(path, data);
-        Mockito.verify(delegate).merge(path, data);
+        verify(delegate).merge(path, data);
     }
 
     @Test
     public void testDelete() {
         object().delete(path);
-        Mockito.verify(delegate).delete(path);
+        verify(delegate).delete(path);
     }
 
     @Test
     public void testReady() {
         final DOMStoreThreePhaseCommitCohort result = object().ready();
-        Assert.assertNotNull(result);
-        Mockito.verify(delegate).ready();
+        assertNotNull(result);
+        verify(delegate).ready();
     }
 }