OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

[openflowplugin.git] / extension / openflowplugin-extension-onf / src / test / java / org / opendaylight / openflowplugin / extension / onf / serializer / BundleAddMessageFactoryTest.java

diff --git a/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactoryTest.java b/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactoryTest.java
index 03e65735ddea631d15eb41996b057c6735dfabaf..7b117b26e2d360f372e4e2fa60d4120c4fbaa504 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactoryTest.java
+++ b/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactoryTest.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.openflowplugin.extension.onf.serializer;
 
+import static org.mockito.ArgumentMatchers.any;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import java.util.ArrayList;
@@ -15,7 +17,6 @@ import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
@@ -86,11 +87,11 @@ public class BundleAddMessageFactoryTest extends AbstractBundleMessageFactoryTes
         if (withProperty) {
             dataBuilder.setBundleProperty(new ArrayList<>(Collections.singleton(
                     BundleTestUtils.createExperimenterProperty(propertyExperimenterData))));
-            Mockito.when(registry.getSerializer(Matchers.any()))
+            Mockito.when(registry.getSerializer(any()))
                     .thenReturn(caseSerializer)
                     .thenReturn(propertySerializer);
         } else {
-            Mockito.when(registry.getSerializer(Matchers.any())).thenReturn(caseSerializer);
+            Mockito.when(registry.getSerializer(any())).thenReturn(caseSerializer);
         }
 
         builder.setOnfAddMessageGroupingData(dataBuilder.build());
@@ -102,7 +103,7 @@ public class BundleAddMessageFactoryTest extends AbstractBundleMessageFactoryTes
         Assert.assertEquals("Wrong bundle ID", 1L, out.readUnsignedInt());
         long padding = out.readUnsignedShort();
         Assert.assertEquals("Wrong flags", 1, out.readUnsignedShort());
-        Mockito.verify(caseSerializer).serialize(Mockito.any(), Mockito.any());
+        Mockito.verify(caseSerializer).serialize(any(), any());
 
         if (withProperty) {
             Mockito.verify(propertySerializer).serialize(propertyExperimenterData, out);