Update sal-distributed-datastore tests a bit

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java
index 42d8d798286def837cfafa6fe3feadc143688dd3..128d08a4d97b6db3739d1f6935a26bacff21765b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContextTest.java
@@ -18,8 +18,9 @@ import com.google.common.util.concurrent.SettableFuture;
 import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.controller.cluster.datastore.messages.DataExists;
 import org.opendaylight.controller.cluster.datastore.messages.ReadData;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
@@ -30,6 +31,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import scala.concurrent.Future;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class LocalTransactionContextTest {
 
     @Mock
@@ -45,7 +47,6 @@ public class LocalTransactionContextTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         localTransactionContext = new LocalTransactionContext(readWriteTransaction, limiter.getIdentifier(),
                 mockReadySupport) {
             @Override
@@ -63,7 +64,7 @@ public class LocalTransactionContextTest {
     @Test
     public void testWrite() {
         YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty();
-        NormalizedNode<?, ?> normalizedNode = mock(NormalizedNode.class);
+        NormalizedNode normalizedNode = mock(NormalizedNode.class);
         localTransactionContext.executeWrite(yangInstanceIdentifier, normalizedNode, null);
         verify(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode);
     }
@@ -71,7 +72,7 @@ public class LocalTransactionContextTest {
     @Test
     public void testMerge() {
         YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty();
-        NormalizedNode<?, ?> normalizedNode = mock(NormalizedNode.class);
+        NormalizedNode normalizedNode = mock(NormalizedNode.class);
         localTransactionContext.executeMerge(yangInstanceIdentifier, normalizedNode, null);
         verify(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode);
     }
@@ -86,7 +87,7 @@ public class LocalTransactionContextTest {
     @Test
     public void testRead() {
         YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty();
-        NormalizedNode<?, ?> normalizedNode = mock(NormalizedNode.class);
+        NormalizedNode normalizedNode = mock(NormalizedNode.class);
         doReturn(FluentFutures.immediateFluentFuture(Optional.of(normalizedNode))).when(readWriteTransaction)
             .read(yangInstanceIdentifier);
         localTransactionContext.executeRead(new ReadData(yangInstanceIdentifier, DataStoreVersions.CURRENT_VERSION),
@@ -118,7 +119,7 @@ public class LocalTransactionContextTest {
     @Test
     public void testReadyWithWriteError() {
         YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty();
-        NormalizedNode<?, ?> normalizedNode = mock(NormalizedNode.class);
+        NormalizedNode normalizedNode = mock(NormalizedNode.class);
         RuntimeException error = new RuntimeException("mock");
         doThrow(error).when(readWriteTransaction).write(yangInstanceIdentifier, normalizedNode);
 
@@ -133,7 +134,7 @@ public class LocalTransactionContextTest {
     @Test
     public void testReadyWithMergeError() {
         YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.empty();
-        NormalizedNode<?, ?> normalizedNode = mock(NormalizedNode.class);
+        NormalizedNode normalizedNode = mock(NormalizedNode.class);
         RuntimeException error = new RuntimeException("mock");
         doThrow(error).when(readWriteTransaction).merge(yangInstanceIdentifier, normalizedNode);