Migrate MockitoJUnitRunner

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / device / PacketInRateLimiterTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/PacketInRateLimiterTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/PacketInRateLimiterTest.java
index 3b7ba9931618adf74cfc5736e357f726b2f71184..8f88e3f55285d94dfd74459ff9bbc04cea6fa118 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/PacketInRateLimiterTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/PacketInRateLimiterTest.java
@@ -8,15 +8,16 @@
 
 package org.opendaylight.openflowplugin.impl.device;
 
+import static org.mockito.ArgumentMatchers.anyBoolean;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
@@ -35,29 +36,29 @@ public class PacketInRateLimiterTest {
     private InOrder caOrdered;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         caOrdered = Mockito.inOrder(connectionAdapter);
         rateLimiter = new PacketInRateLimiter(connectionAdapter, 4, 10, messageSpy, 0.5f);
     }
 
     @Test
-    public void testDisableFlow() throws Exception {
+    public void testDisableFlow() {
         rateLimiter.disableFlow();
 
-        Mockito.verify(messageSpy).spyMessage(DeviceContext.class, MessageSpy.STATISTIC_GROUP.OFJ_BACKPRESSURE_ON);
+        Mockito.verify(messageSpy).spyMessage(DeviceContext.class, MessageSpy.StatisticsGroup.OFJ_BACKPRESSURE_ON);
         Mockito.verify(connectionAdapter).setPacketInFiltering(true);
     }
 
     @Test
-    public void testEnableFlow() throws Exception {
+    public void testEnableFlow() {
         rateLimiter.enableFlow();
 
-        Mockito.verify(messageSpy).spyMessage(DeviceContext.class, MessageSpy.STATISTIC_GROUP.OFJ_BACKPRESSURE_OFF);
+        Mockito.verify(messageSpy).spyMessage(DeviceContext.class, MessageSpy.StatisticsGroup.OFJ_BACKPRESSURE_OFF);
         Mockito.verify(connectionAdapter).setPacketInFiltering(false);
     }
 
     @Test
-    public void testDrainLowWaterMark() throws Exception {
+    public void testDrainLowWaterMark() {
         // scenario:
         // occupy 4 permits
         // drain low water mark = lwm temporarily set to 50% (= 2) and get limited
@@ -91,7 +92,7 @@ public class PacketInRateLimiterTest {
         Assert.assertEquals(6, rateLimiter.getOccupiedPermits());
         Assert.assertFalse(rateLimiter.isLimited());
 
-        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(Matchers.anyBoolean());
+        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(anyBoolean());
     }
 
     private void acquirePermits(int permits) {
@@ -110,7 +111,7 @@ public class PacketInRateLimiterTest {
     }
 
     @Test
-    public void testAcquirePermit() throws Exception {
+    public void testAcquirePermit() {
         Assert.assertEquals(0, rateLimiter.getOccupiedPermits());
         Assert.assertFalse(rateLimiter.isLimited());
 
@@ -136,11 +137,11 @@ public class PacketInRateLimiterTest {
         Assert.assertFalse(rateLimiter.isLimited());
         caOrdered.verify(connectionAdapter).setPacketInFiltering(false);
 
-        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(Matchers.anyBoolean());
+        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(anyBoolean());
     }
 
     @Test
-    public void testChangeWaterMarks1() throws Exception {
+    public void testChangeWaterMarks1() {
         rateLimiter.changeWaterMarks(2, 4);
         acquirePermits(4);
         Assert.assertEquals(4, rateLimiter.getOccupiedPermits());
@@ -163,11 +164,11 @@ public class PacketInRateLimiterTest {
         Assert.assertFalse(rateLimiter.isLimited());
         caOrdered.verify(connectionAdapter).setPacketInFiltering(false);
 
-        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(Matchers.anyBoolean());
+        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(anyBoolean());
     }
 
     @Test
-    public void testChangeWaterMarks2() throws Exception {
+    public void testChangeWaterMarks2() {
         // draining to lwm/occupied = 3/6
         acquirePermits(6);
         rateLimiter.drainLowWaterMark();
@@ -195,6 +196,6 @@ public class PacketInRateLimiterTest {
         Assert.assertEquals(12, rateLimiter.getOccupiedPermits());
         Assert.assertFalse(rateLimiter.isLimited());
 
-        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(Matchers.anyBoolean());
+        Mockito.verify(connectionAdapter, Mockito.times(2)).setPacketInFiltering(anyBoolean());
     }
 }
\ No newline at end of file