X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=extension%2Fopenflowplugin-extension-onf%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fextension%2Fonf%2Fserializer%2FBundleAddMessageFactoryTest.java;h=7b117b26e2d360f372e4e2fa60d4120c4fbaa504;hb=b4f4b4b702e2ccd8a7c62fd2a5c184c5b1cbe665;hp=03e65735ddea631d15eb41996b057c6735dfabaf;hpb=2373479fdc5a59f1399e50f5de1dc321d429d76b;p=openflowplugin.git 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 03e65735dd..7b117b26e2 100644 --- 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);