Update sal-distributed-datastore tests a bit

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
index 10fee5c6d5258e9440a4a79ede3505897016b161..2683bf7e25fe868b0bcacf64823fe5407578e014 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionContextWrapperTest.java
@@ -5,42 +5,39 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class TransactionContextWrapperTest {
-
-    @Mock
-    TransactionIdentifier identifier;
-
     @Mock
-    ActorContext actorContext;
+    private ActorUtils actorUtils;
 
     @Mock
-    TransactionContext transactionContext;
+    private TransactionContext transactionContext;
 
-    TransactionContextWrapper transactionContextWrapper;
+    private TransactionContextWrapper transactionContextWrapper;
 
     @Before
-    public void setUp(){
-        MockitoAnnotations.initMocks(this);
-        doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
-        transactionContextWrapper = new TransactionContextWrapper(identifier, actorContext);
+    public void setUp() {
+        doReturn(DatastoreContext.newBuilder().build()).when(actorUtils).getDatastoreContext();
+        transactionContextWrapper = new TransactionContextWrapper(MockIdentifiers.transactionIdentifier(
+            TransactionContextWrapperTest.class, "mock"), actorUtils, "mock");
     }
 
     @Test
-    public void testExecutePriorTransactionOperations(){
-        for(int i=0;i<100;i++) {
+    public void testExecutePriorTransactionOperations() {
+        for (int i = 0; i < 100; i++) {
             transactionContextWrapper.maybeExecuteTransactionOperation(mock(TransactionOperation.class));
         }
         assertEquals(901, transactionContextWrapper.getLimiter().availablePermits());
@@ -49,4 +46,4 @@ public class TransactionContextWrapperTest {
 
         assertEquals(1001, transactionContextWrapper.getLimiter().availablePermits());
     }
-}
\ No newline at end of file
+}