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%2FClientBackedWriteTransactionTest.java;h=2dbbaa324555f054fb3ce51d5aa3b63918f06a32;hp=78a5c4b5804b162505b6a060b25a31eb2a9746da;hb=ded31428cae8b8907dcf06aba0dcd2fdd8cbe01b;hpb=f41c5e6e6f6e10b36b1e4b1992877e38e718c8fb

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 78a5c4b580..2dbbaa3245 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,66 +7,66 @@
  */
 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;
-    @Mock
-    private YangInstanceIdentifier path;
+    private NormalizedNode data;
     @Mock
     private DOMStoreThreePhaseCommitCohort readyCohort;
 
     @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        Mockito.doReturn(TRANSACTION_ID).when(delegate).getIdentifier();
-        Mockito.doReturn(readyCohort).when(delegate).ready();
+    public void setUp() {
+        doReturn(TRANSACTION_ID).when(delegate).getIdentifier();
+        doReturn(readyCohort).when(delegate).ready();
 
         object = new ClientBackedWriteTransaction(delegate, null);
     }
 
     @Override
-    ClientBackedWriteTransaction object() throws Exception {
+    ClientBackedWriteTransaction object() {
         return object;
     }
 
     @Test
-    public void testWrite() throws Exception {
-        object().write(path, data);
-        Mockito.verify(delegate).write(path, data);
+    public void testWrite() {
+        object().write(YangInstanceIdentifier.empty(), data);
+        verify(delegate).write(YangInstanceIdentifier.empty(), data);
     }
 
     @Test
-    public void testMerge() throws Exception {
-        object().merge(path, data);
-        Mockito.verify(delegate).merge(path, data);
+    public void testMerge() {
+        object().merge(YangInstanceIdentifier.empty(), data);
+        verify(delegate).merge(YangInstanceIdentifier.empty(), data);
     }
 
     @Test
-    public void testDelete() throws Exception {
-        object().delete(path);
-        Mockito.verify(delegate).delete(path);
+    public void testDelete() {
+        object().delete(YangInstanceIdentifier.empty());
+        verify(delegate).delete(YangInstanceIdentifier.empty());
     }
 
     @Test
-    public void testReady() throws Exception {
+    public void testReady() {
         final DOMStoreThreePhaseCommitCohort result = object().ready();
-        Assert.assertNotNull(result);
-        Mockito.verify(delegate).ready();
+        assertNotNull(result);
+        verify(delegate).ready();
     }
 }