Modernize TransactionRateLimitingCallbackTest

Use assertThrows() and mockito runner.

Change-Id: I8cda7b267ebc923304e5b1b60c42d78a70d17d19
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallbackTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallbackTest.java
index de3a78073f26cf5d72ee87998ed28a74229a28a0..14783441b77e96ac837a784fbe2f923aa1ffbb86 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallbackTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionRateLimitingCallbackTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
  */
 package org.opendaylight.controller.cluster.datastore;
 

-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;

 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.doReturn;


@@ -19,8 +19,9 @@ import com.google.common.base.Ticker;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;

+import org.junit.runner.RunWith;

 import org.mockito.Mock;
 import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;

 import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 
 /**
 import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 
 /**


@@ -28,14 +29,12 @@ import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
  *
  * @author Thomas Pantelis
  */
  *
  * @author Thomas Pantelis
  */

+@RunWith(MockitoJUnitRunner.StrictStubs.class)

 public class TransactionRateLimitingCallbackTest {
 public class TransactionRateLimitingCallbackTest {

-

     @Mock
     ActorUtils mockContext;
     @Mock
     ActorUtils mockContext;

-

     @Mock
     Timer mockTimer;
     @Mock
     Timer mockTimer;

-

     @Mock
     Ticker mockTicker;
 
     @Mock
     Ticker mockTicker;
 


@@ -43,7 +42,6 @@ public class TransactionRateLimitingCallbackTest {
 
     @Before
     public void setUp() {
 
     @Before
     public void setUp() {

-        MockitoAnnotations.initMocks(this);

         doReturn(mockTimer).when(mockContext).getOperationTimer(ActorUtils.COMMIT);
         callback = new TransactionRateLimitingCallback(mockContext);
         TransactionRateLimitingCallback.setTicker(mockTicker);
         doReturn(mockTimer).when(mockContext).getOperationTimer(ActorUtils.COMMIT);
         callback = new TransactionRateLimitingCallback(mockContext);
         TransactionRateLimitingCallback.setTicker(mockTicker);


@@ -85,12 +83,7 @@ public class TransactionRateLimitingCallbackTest {
 
     @Test
     public void testSuccessWithoutRun() {
 
     @Test
     public void testSuccessWithoutRun() {

-        try {
-            callback.success();
-            fail("Expected IllegalStateException");
-        } catch (IllegalStateException e) {
-            // expected
-        }
+        final var ex = assertThrows(IllegalStateException.class, callback::success);

 
         verify(mockTimer, never()).update(anyLong(), any(TimeUnit.class));
     }
 
         verify(mockTimer, never()).update(anyLong(), any(TimeUnit.class));
     }