Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / core / OFDecoderTest.java

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
index 090ab2dc5e3ac92e7757aefb6c77f726d06b52ea..84d17d8b8790e54a2c40e838a0812c2adba66a82 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.core;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyShort;
 import static org.mockito.Mockito.when;
 
 import io.netty.buffer.ByteBuf;
@@ -24,6 +23,7 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializationFactory;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Unit tests for OFDecoder.
@@ -50,13 +50,13 @@ public class OFDecoderTest {
         ofDecoder = new OFDecoder();
         ofDecoder.setDeserializationFactory(mockDeserializationFactory);
         writeObj = ByteBufUtils.hexStringToByteBuf("16 03 01 00");
-        inMsg = new VersionMessageWrapper((short) 8, writeObj);
+        inMsg = new VersionMessageWrapper(Uint8.valueOf(8), writeObj);
         outList = new ArrayList<>();
     }
 
     @Test
     public void testDecode() {
-        when(mockDeserializationFactory.deserialize(any(ByteBuf.class), anyShort())).thenReturn(mockDataObject);
+        when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))).thenReturn(mockDataObject);
 
         ofDecoder.decode(mockChHndlrCtx, inMsg, outList);
 
@@ -67,7 +67,7 @@ public class OFDecoderTest {
 
     @Test
     public void testDecodeDeserializeException() {
-        when(mockDeserializationFactory.deserialize(any(ByteBuf.class), anyShort()))
+        when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class)))
                 .thenThrow(new IllegalArgumentException());
 
         ofDecoder.decode(mockChHndlrCtx, inMsg, outList);
@@ -79,7 +79,7 @@ public class OFDecoderTest {
 
     @Test
     public void testDecodeDeserializeNull() {
-        when(mockDeserializationFactory.deserialize(any(ByteBuf.class), anyShort())).thenReturn(null);
+        when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))).thenReturn(null);
 
         ofDecoder.decode(mockChHndlrCtx, inMsg, outList);