Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / action / SetFieldActionDeserializerTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java
index 644aef2e40984e2af3a69ad40b21416ac05c9936..234faea704d40043e22a23a32a336964393248b4 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java
@@ -25,22 +25,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 public class SetFieldActionDeserializerTest extends AbstractActionDeserializerTest {
 
     @Test
-    public void testDeserialize() throws Exception {
+    public void testDeserialize() {
         final ByteBuf in = UnpooledByteBufAllocator.DEFAULT.buffer();
         final int portNum = 0xfffffffa;
         writeHeader(in);
         in.writeShort(OxmMatchConstants.OPENFLOW_BASIC_CLASS);
         in.writeByte(OxmMatchConstants.IN_PORT << 1);
-        in.writeByte(EncodeConstants.SIZE_OF_INT_IN_BYTES);
+        in.writeByte(Integer.BYTES);
         in.writeInt(portNum);
-        in.writeZero(EncodeConstants.SIZE_OF_INT_IN_BYTES);
+        in.writeZero(Integer.BYTES);
 
         final Action action = deserializeAction(in);
-        assertTrue(SetFieldCase.class.isInstance(action));
+        assertTrue(action instanceof SetFieldCase);
         assertEquals(
                 OpenflowPortsUtil
-                        .getPortLogicalName(EncodeConstants.OF13_VERSION_ID, BinContent.intToUnsignedLong(portNum)),
-                SetFieldCase.class.cast(action).getSetField().getInPort().getValue());
+                        .getPortLogicalName(EncodeConstants.OF_VERSION_1_3, BinContent.intToUnsignedLong(portNum)),
+                ((SetFieldCase) action).getSetField().getInPort().getValue());
         assertEquals(0, in.readableBytes());
     }