Update sal-distributed-datastore tests a bit

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / databroker / ClientBackedWriteTransactionTest.java

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 8091f705530ea86bb4e7f459a10354caa8ccf9a1..21ef8967aecaa2c3d512cbb48146eec01c7c3798 100644 (file)
--- 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,68 @@
  */
 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
     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 {
+    public void testWrite() {
         object().write(path, data);
-        Mockito.verify(delegate).write(path, data);
+        verify(delegate).write(path, data);
     }
 
     @Test
-    public void testMerge() throws Exception {
+    public void testMerge() {
         object().merge(path, data);
-        Mockito.verify(delegate).merge(path, data);
+        verify(delegate).merge(path, data);
     }
 
     @Test
-    public void testDelete() throws Exception {
+    public void testDelete() {
         object().delete(path);
-        Mockito.verify(delegate).delete(path);
+        verify(delegate).delete(path);
     }
 
     @Test
-    public void testReady() throws Exception {
-        final org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort result = object().ready();
-        Assert.assertNotNull(result);
-        Mockito.verify(delegate).ready();
+    public void testReady() {
+        final DOMStoreThreePhaseCommitCohort result = object().ready();
+        assertNotNull(result);
+        verify(delegate).ready();
     }
-}
\ No newline at end of file
+}