From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Mon, 20 Oct 2014 12:25:09 +0000 (+0200)
Subject: Increased unit test coverage for some deserialization factories
X-Git-Tag: release/lithium~116^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ba9b36dae13ea6deb1b34c2d40281c1dd68a2eff;p=openflowjava.git

Increased unit test coverage for some deserialization factories

Change-Id: If770094c17a7c2988602d17a7463243cbce63fee
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
index 2d3cc782..13da41f0 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
@@ -15,14 +15,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.OpenflowUtils;
+import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionTypeV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.CapabilitiesV10;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortStateV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.features.reply.PhyPort;
@@ -88,7 +86,7 @@ public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeatur
                 SET_NW_DST, SET_NW_SRC, SET_NW_TOS, SET_TP_DST, SET_TP_SRC,
                 SET_VLAN_PCP, SET_VLAN_VID, STRIP_VLAN, VENDOR);
     }
-    
+
     private static PhyPort deserializePort(ByteBuf rawMessage) {
         PhyPortBuilder builder = new PhyPortBuilder();
         builder.setPortNo((long) rawMessage.readUnsignedShort());
@@ -96,55 +94,12 @@ public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeatur
         rawMessage.readBytes(address);
         builder.setHwAddr(new MacAddress(ByteBufUtils.macAddressToString(address)));
         builder.setName(ByteBufUtils.decodeNullTerminatedString(rawMessage, EncodeConstants.MAX_PORT_NAME_LENGTH));
-        builder.setConfigV10(createPortConfig(rawMessage.readUnsignedInt()));
-        builder.setStateV10(createPortState(rawMessage.readUnsignedInt()));
-        builder.setCurrentFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setAdvertisedFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setSupportedFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setPeerFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setConfigV10(OpenflowUtils.createPortConfig(rawMessage.readUnsignedInt()));
+        builder.setStateV10(OpenflowUtils.createPortState(rawMessage.readUnsignedInt()));
+        builder.setCurrentFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setAdvertisedFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setSupportedFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setPeerFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
         return builder.build();
     }
-
-    
-    
-    private static PortStateV10 createPortState(long input){
-        final Boolean _linkDown = ((input) & (1<<0)) != 0;
-        final Boolean _blocked = ((input) & (1<<1)) != 0;
-        final Boolean _live = ((input) & (1<<2)) != 0;
-        final Boolean _stpListen = ((input) & (0<<8)) != 0;
-        final Boolean _stpLearn = ((input) & (1<<8)) != 0;
-        final Boolean _stpForward = ((input) & (1<<9)) != 0; // equals 2 << 8
-        final Boolean _stpBlock = (((input) & (1<<9)) != 0) && (((input) & (1<<8)) != 0); // equals 3 << 8
-        final Boolean _stpMask = ((input) & (1<<10)) != 0; // equals 4 << 8
-        return new PortStateV10(_blocked, _linkDown, _live, _stpBlock, _stpForward, _stpLearn, _stpListen, _stpMask);
-    }
-    
-    private static PortConfigV10 createPortConfig(long input){
-        final Boolean _portDown = ((input) & (1<<0)) != 0;
-        final Boolean _noStp = ((input) & (1<<1)) != 0;
-        final Boolean _noRecv = ((input) & (1<<2)) != 0;
-        final Boolean _noRecvStp = ((input) & (1<<3)) != 0;
-        final Boolean _noFlood = ((input) & (1<<4)) != 0;
-        final Boolean _noFwd  = ((input) & (1<<5)) != 0;
-        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;
-        return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown);
-    }
-    
-    private static PortFeaturesV10 createPortFeatures(long input){
-        final Boolean _10mbHd = ((input) & (1<<0)) != 0;
-        final Boolean _10mbFd = ((input) & (1<<1)) != 0;
-        final Boolean _100mbHd = ((input) & (1<<2)) != 0;
-        final Boolean _100mbFd = ((input) & (1<<3)) != 0;
-        final Boolean _1gbHd = ((input) & (1<<4)) != 0;
-        final Boolean _1gbFd = ((input) & (1<<5)) != 0;
-        final Boolean _10gbFd = ((input) & (1<<6)) != 0;
-        final Boolean _copper = ((input) & (1<<7)) != 0;
-        final Boolean _fiber = ((input) & (1<<8)) != 0;
-        final Boolean _autoneg = ((input) & (1<<9)) != 0;
-        final Boolean _pause = ((input) & (1<<10)) != 0;
-        final Boolean _pauseAsym = ((input) & (1<<11)) != 0;
-        return new PortFeaturesV10(_100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd,
-                _1gbFd, _1gbHd, _autoneg, _copper, _fiber, _pause, _pauseAsym);
-    }
-    
-}
+}
\ No newline at end of file
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
index e7036ed8..eed4b104 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
@@ -11,13 +11,11 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 import io.netty.buffer.ByteBuf;
 
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.OpenflowUtils;
+import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortReason;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortStateV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessageBuilder;
 
@@ -40,57 +38,17 @@ public class OF10PortStatusMessageFactory implements OFDeserializer<PortStatusMe
         return builder.build();
     }
 
-    private static PortStateV10 createPortState(long input){
-        final Boolean _linkDown = ((input) & (1<<0)) != 0;
-        final Boolean _blocked = ((input) & (1<<1)) != 0;
-        final Boolean _live = ((input) & (1<<2)) != 0;
-        final Boolean _stpListen = ((input) & (0<<8)) != 0;
-        final Boolean _stpLearn = ((input) & (1<<8)) != 0;
-        final Boolean _stpForward = ((input) & (1<<9)) != 0; // equals 2 << 8
-        final Boolean _stpBlock = (((input) & (1<<9)) != 0) && (((input) & (1<<8)) != 0); // equals 3 << 8
-        final Boolean _stpMask = ((input) & (1<<10)) != 0; // equals 4 << 8
-        return new PortStateV10(_blocked, _linkDown, _live, _stpBlock, _stpForward, _stpLearn, _stpListen, _stpMask);
-    }
-    
-    private static PortConfigV10 createPortConfig(long input){
-        final Boolean _portDown = ((input) & (1<<0)) != 0;
-        final Boolean _noStp = ((input) & (1<<1)) != 0;
-        final Boolean _noRecv = ((input) & (1<<2)) != 0;
-        final Boolean _noRecvStp = ((input) & (1<<3)) != 0;
-        final Boolean _noFlood = ((input) & (1<<4)) != 0;
-        final Boolean _noFwd  = ((input) & (1<<5)) != 0;
-        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;
-        return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown);
-    }
-    
-    private static PortFeaturesV10 createPortFeatures(long input){
-        final Boolean _10mbHd = ((input) & (1<<0)) != 0;
-        final Boolean _10mbFd = ((input) & (1<<1)) != 0;
-        final Boolean _100mbHd = ((input) & (1<<2)) != 0;
-        final Boolean _100mbFd = ((input) & (1<<3)) != 0;
-        final Boolean _1gbHd = ((input) & (1<<4)) != 0;
-        final Boolean _1gbFd = ((input) & (1<<5)) != 0;
-        final Boolean _10gbFd = ((input) & (1<<6)) != 0;
-        final Boolean _copper = ((input) & (1<<7)) != 0;
-        final Boolean _fiber = ((input) & (1<<8)) != 0;
-        final Boolean _autoneg = ((input) & (1<<9)) != 0;
-        final Boolean _pause = ((input) & (1<<10)) != 0;
-        final Boolean _pauseAsym = ((input) & (1<<11)) != 0;
-        return new PortFeaturesV10(_100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd,
-                _1gbFd, _1gbHd, _autoneg, _copper, _fiber, _pause, _pauseAsym);
-    }
-    
     private static void deserializePort(ByteBuf rawMessage, PortStatusMessageBuilder builder) {
         builder.setPortNo((long) rawMessage.readUnsignedShort());
         byte[] address = new byte[EncodeConstants.MAC_ADDRESS_LENGTH];
         rawMessage.readBytes(address);
         builder.setHwAddr(new MacAddress(ByteBufUtils.macAddressToString(address)));
         builder.setName(ByteBufUtils.decodeNullTerminatedString(rawMessage, EncodeConstants.MAX_PORT_NAME_LENGTH));
-        builder.setConfigV10(createPortConfig(rawMessage.readUnsignedInt()));
-        builder.setStateV10(createPortState(rawMessage.readUnsignedInt()));
-        builder.setCurrentFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setAdvertisedFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setSupportedFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setPeerFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setConfigV10(OpenflowUtils.createPortConfig(rawMessage.readUnsignedInt()));
+        builder.setStateV10(OpenflowUtils.createPortState(rawMessage.readUnsignedInt()));
+        builder.setCurrentFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setAdvertisedFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setSupportedFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setPeerFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
     }
-}
+}
\ No newline at end of file
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
new file mode 100644
index 00000000..8ba8e74c
--- /dev/null
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2014 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.openflowjava.protocol.impl.util;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortStateV10;
+
+/**
+ * Used for common structures translation / conversion
+ * 
+ * @author michal.polkorab
+ */
+public abstract class OpenflowUtils {
+
+    /**
+     * Creates PortState (OF v1.0) from input
+     * @param input value read from buffer
+     * @return port state
+     */
+    public static PortStateV10 createPortState(long input){
+        final Boolean _linkDown = ((input) & (1<<0)) != 0;
+        final Boolean _blocked = ((input) & (1<<1)) != 0;
+        final Boolean _live = ((input) & (1<<2)) != 0;
+        final Boolean _stpListen = ((input) & (1<<8)) == 0;
+        final Boolean _stpLearn = ((input) & (1<<8)) != 0;
+        final Boolean _stpForward = ((input) & (1<<9)) != 0; // equals 2 << 8
+        final Boolean _stpBlock = (((input) & (1<<9)) != 0) && (((input) & (1<<8)) != 0); // equals 3 << 8
+        final Boolean _stpMask = ((input) & (1<<10)) != 0; // equals 4 << 8
+        return new PortStateV10(_blocked, _linkDown, _live, _stpBlock, _stpForward, _stpLearn, _stpListen, _stpMask);
+    }
+
+    /**
+     * Creates PortConfig (OF v1.0) from input
+     * @param input value read from buffer
+     * @return port state
+     */
+    public static PortConfigV10 createPortConfig(long input){
+        final Boolean _portDown = ((input) & (1<<0)) != 0;
+        final Boolean _noStp = ((input) & (1<<1)) != 0;
+        final Boolean _noRecv = ((input) & (1<<2)) != 0;
+        final Boolean _noRecvStp = ((input) & (1<<3)) != 0;
+        final Boolean _noFlood = ((input) & (1<<4)) != 0;
+        final Boolean _noFwd  = ((input) & (1<<5)) != 0;
+        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;
+        return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown);
+    }
+
+    /**
+     * Creates PortFeatures (OF v1.0) from input
+     * @param input value read from buffer
+     * @return port state
+     */
+    public static PortFeaturesV10 createPortFeatures(long input){
+        final Boolean _10mbHd = ((input) & (1<<0)) != 0;
+        final Boolean _10mbFd = ((input) & (1<<1)) != 0;
+        final Boolean _100mbHd = ((input) & (1<<2)) != 0;
+        final Boolean _100mbFd = ((input) & (1<<3)) != 0;
+        final Boolean _1gbHd = ((input) & (1<<4)) != 0;
+        final Boolean _1gbFd = ((input) & (1<<5)) != 0;
+        final Boolean _10gbFd = ((input) & (1<<6)) != 0;
+        final Boolean _copper = ((input) & (1<<7)) != 0;
+        final Boolean _fiber = ((input) & (1<<8)) != 0;
+        final Boolean _autoneg = ((input) & (1<<9)) != 0;
+        final Boolean _pause = ((input) & (1<<10)) != 0;
+        final Boolean _pauseAsym = ((input) & (1<<11)) != 0;
+        return new PortFeaturesV10(_100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd,
+                _1gbFd, _1gbHd, _autoneg, _copper, _fiber, _pause, _pauseAsym);
+    }
+}
\ No newline at end of file
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java
index 233c7e38..ad4ccc59 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java
@@ -47,7 +47,7 @@ public class FeaturesReplyMessageFactoryTest {
     @Test
     public void test() {
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 04 05 06 07 00 01 02 03 01 01 00 00 00"
-                + " 00 01 41 00 01 02 03");
+                + " 00 00 00 00 01 02 03");
         GetFeaturesOutput builtByFactory = BufferHelper.deserialize(featuresFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);
@@ -55,7 +55,21 @@ public class FeaturesReplyMessageFactoryTest {
         Assert.assertEquals("Wrong buffers", 0x00010203L, builtByFactory.getBuffers().longValue());
         Assert.assertEquals("Wrong number of tables", 0x01, builtByFactory.getTables().shortValue());
         Assert.assertEquals("Wrong auxiliaryId", 0x01, builtByFactory.getAuxiliaryId().shortValue());
-        Assert.assertEquals("Wrong capabilities", new Capabilities(true, false, false, true, false, true, false), builtByFactory.getCapabilities());
+        Assert.assertEquals("Wrong capabilities", new Capabilities(false, false, false, false, false, false, false), builtByFactory.getCapabilities());
         Assert.assertEquals("Wrong reserved", 0x00010203L, builtByFactory.getReserved().longValue());
     }
-}
+
+    /**
+     * Testing {@link FeaturesReplyMessageFactory} for correct translation into POJO
+     * (capabilities set)
+     */
+    @Test
+    public void testCapabilities() {
+        ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 04 05 06 07 00 01 02 03 01 01 00 00 00"
+                + " 00 01 6F 00 01 02 03");
+        GetFeaturesOutput builtByFactory = BufferHelper.deserialize(featuresFactory, bb);
+
+        BufferHelper.checkHeaderV13(builtByFactory);
+        Assert.assertEquals("Wrong capabilities", new Capabilities(true, true, true, true, true, true, true), builtByFactory.getCapabilities());
+    }
+}
\ No newline at end of file
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java
index 4330e32d..9530eaba 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java
@@ -53,31 +53,31 @@ public class OF10FeaturesReplyMessageFactoryTest {
     @Test
     public void test() {
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 04 05 06 07 00 01 02 03 01 00 00 00 "
-                + "00 00 00 8B 00 00 03 B5 "
-                + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 01 01 "
-                + "00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88");
+                + "00 00 00 FF 00 00 0F FF "
+                + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 7F 00 00 02 00 "
+                + "00 00 0F FF 00 00 00 00 00 00 03 0C 00 00 08 88");
         GetFeaturesOutput builtByFactory = BufferHelper.deserialize(featuresFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong datapathId", 0x0001020304050607L, builtByFactory.getDatapathId().longValue());
         Assert.assertEquals("Wrong n-buffers", 0x00010203L, builtByFactory.getBuffers().longValue());
         Assert.assertEquals("Wrong n-tables", 0x01, builtByFactory.getTables().shortValue());
-        Assert.assertEquals("Wrong capabilities", new CapabilitiesV10(true, true, false, false, false, false, true, true),
+        Assert.assertEquals("Wrong capabilities", new CapabilitiesV10(true, true, true, true, true, true, true, true),
                 builtByFactory.getCapabilitiesV10());
-        Assert.assertEquals("Wrong actions", new ActionTypeV10(false, true, true, true, true, false, true,
-                false, true, true, false, false, false), builtByFactory.getActionsV10());
+        Assert.assertEquals("Wrong actions", new ActionTypeV10(true, true, true, true, true, true, true,
+                true, true, true, true, true, false), builtByFactory.getActionsV10());
         PhyPort port = builtByFactory.getPhyPort().get(0);
         Assert.assertEquals("Wrong port - port-no", 16, port.getPortNo().intValue());
         Assert.assertEquals("Wrong port - hw-addr", new MacAddress("01:01:05:01:04:02"), port.getHwAddr());
         Assert.assertEquals("Wrong port - name", new String("ALOHA"), port.getName());
-        Assert.assertEquals("Wrong port - config", new PortConfigV10(true, false, false, true, false, false, true),
+        Assert.assertEquals("Wrong port - config", new PortConfigV10(true, true, true, true, true, true, true),
                 port.getConfigV10());
-        Assert.assertEquals("Wrong port - state", new PortStateV10(false, true, false, false, false, true, false, false),
+        Assert.assertEquals("Wrong port - state",  new PortStateV10(false, false, false, false, true, false, true, false),
                 port.getStateV10());
-        Assert.assertEquals("Wrong port - curr", new PortFeaturesV10(false, false, false, false, true, true, true,
-                false, false, false, false, false), port.getCurrentFeaturesV10());
-        Assert.assertEquals("Wrong port - advertised", new PortFeaturesV10(false, false, true, true, false, false,
-                false, false, false, false, true, false), port.getAdvertisedFeaturesV10());
+        Assert.assertEquals("Wrong port - curr", new PortFeaturesV10(true, true, true, true, true, true, true,
+                true, true, true, true, true), port.getCurrentFeaturesV10());
+        Assert.assertEquals("Wrong port - advertised", new PortFeaturesV10(false, false, false, false, false, false,
+                false, false, false, false, false, false), port.getAdvertisedFeaturesV10());
         Assert.assertEquals("Wrong port - supported", new PortFeaturesV10(true, true, false, false, false, false,
                 false, true, false, true, false, false), port.getSupportedFeaturesV10());
         Assert.assertEquals("Wrong port - peer", new PortFeaturesV10(true, false, false, false, false, false, false,
@@ -88,30 +88,44 @@ public class OF10FeaturesReplyMessageFactoryTest {
      * Testing {@link OF10FeaturesReplyMessageFactory} for correct translation into POJO
      */
     @Test
-    public void testWithNoPortsSet() {
+    public void testWithTwoPortsSet() {
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 04 05 06 07 00 01 02 03 01 00 00 00 "
                 + "00 00 00 8B 00 00 03 B5 "
-                + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 01 01 "
+                + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 07 01 "
                 + "00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88 "
-                + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 01 01 "
+                + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 15 00 00 00 00 "
                 + "00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88");
         GetFeaturesOutput builtByFactory = BufferHelper.deserialize(featuresFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong ports size", 2, builtByFactory.getPhyPort().size());
+        PhyPort port = builtByFactory.getPhyPort().get(0);
+        Assert.assertEquals("Wrong port - port-no", 16, port.getPortNo().intValue());
+        Assert.assertEquals("Wrong port - hw-addr", new MacAddress("01:01:05:01:04:02"), port.getHwAddr());
+        Assert.assertEquals("Wrong port - name", new String("ALOHA"), port.getName());
+        Assert.assertEquals("Wrong port - config", new PortConfigV10(false, false, false, false, false, false, false),
+                port.getConfigV10());
+        Assert.assertEquals("Wrong port - state",  new PortStateV10(false, true, false, true, true, true, false, true),
+                port.getStateV10());
+        port = builtByFactory.getPhyPort().get(1);
+        Assert.assertEquals("Wrong port - state",  new PortStateV10(false, false, false, false, false, false, true, false),
+                port.getStateV10());
     }
-    
+
     /**
      * Testing {@link OF10FeaturesReplyMessageFactory} for correct translation into POJO
      */
     @Test
-    public void testWithTwoPortsSet() {
+    public void testWithNoPortsSet() {
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 04 05 06 07 00 01 02 03 01 00 00 00 "
-                + "00 00 00 8B 00 00 03 B5");
+                + "00 00 00 00 00 00 00 00");
         GetFeaturesOutput builtByFactory = BufferHelper.deserialize(featuresFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);
+        Assert.assertEquals("Wrong capabilities", new CapabilitiesV10(false, false, false, false, false, false, false, false),
+                builtByFactory.getCapabilitiesV10());
+        Assert.assertEquals("Wrong actions", new ActionTypeV10(false, false, false, false, false, false, false,
+                false, false, false, false, false, false), builtByFactory.getActionsV10());
         Assert.assertEquals("Wrong ports size", 0, builtByFactory.getPhyPort().size());
     }
-
-}
+}
\ No newline at end of file
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java
index 759b0b66..6b451872 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java
@@ -52,7 +52,7 @@ public class OF10PortStatusMessageFactoryTest {
     public void test(){
         ByteBuf bb = BufferHelper.buildBuffer("00 00 00 00 00 00 00 00 "
                 + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 "
-                + "00 00 00 00 15 00 00 01 01 00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88");
+                + "00 00 00 00 15 00 00 00 01 00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88");
         PortStatusMessage builtByFactory = BufferHelper.deserialize(statusFactory, bb);
         
         BufferHelper.checkHeaderV10(builtByFactory);
@@ -62,7 +62,7 @@ public class OF10PortStatusMessageFactoryTest {
         Assert.assertEquals("Wrong builtByFactory - name", new String("ALOHA"), builtByFactory.getName());
         Assert.assertEquals("Wrong builtByFactory - config", new PortConfigV10(true, false, false, true, false, false, true),
                 builtByFactory.getConfigV10());
-        Assert.assertEquals("Wrong builtByFactory - state", new PortStateV10(false, true, false, false, false, true, false, false),
+        Assert.assertEquals("Wrong builtByFactory - state", new PortStateV10(false, true, false, false, false, false, true, false),
                 builtByFactory.getStateV10());
         Assert.assertEquals("Wrong builtByFactory - curr", new PortFeaturesV10(false, false, false, false, true, true, true,
                 false, false, false, false, false), builtByFactory.getCurrentFeaturesV10());
@@ -73,5 +73,4 @@ public class OF10PortStatusMessageFactoryTest {
         Assert.assertEquals("Wrong builtByFactory - peer", new PortFeaturesV10(true, false, false, false, false, false, false,
                 false, true, false, false, true), builtByFactory.getPeerFeaturesV10());
     }
-
-}
+}
\ No newline at end of file
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtilsTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtilsTest.java
new file mode 100644
index 00000000..47e92623
--- /dev/null
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtilsTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2014 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.openflowjava.protocol.impl.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortStateV10;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class OpenflowUtilsTest {
+
+    /**
+     * Tests {@link OpenflowUtils#createPortState(long)}
+     */
+    @Test
+    public void testPortState() {
+        PortStateV10 state = OpenflowUtils.createPortState(512L);
+        Assert.assertEquals("Wrong port state",
+                new PortStateV10(false, false, false, false, true, false, true, false), state);
+
+        state = OpenflowUtils.createPortState(1793L);
+        Assert.assertEquals("Wrong port state",
+                new PortStateV10(false, true, false, true, true, true, false, true), state);
+
+        state = OpenflowUtils.createPortState(1L);
+        Assert.assertEquals("Wrong port state",
+                new PortStateV10(false, true, false, false, false, false, true, false), state);
+    }
+
+    /**
+     * Tests {@link OpenflowUtils#createPortConfig(long)}
+     */
+    @Test
+    public void testPortConfig() {
+        PortConfigV10 config = OpenflowUtils.createPortConfig(127L);
+        Assert.assertEquals("Wrong port config",
+                new PortConfigV10(true, true, true, true, true, true, true), config);
+
+        config = OpenflowUtils.createPortConfig(0L);
+        Assert.assertEquals("Wrong port config",
+                new PortConfigV10(false, false, false, false, false, false, false), config);
+    }
+
+    /**
+     * Tests {@link OpenflowUtils#createPortFeatures(long)}
+     */
+    @Test
+    public void testPortFeatures() {
+        PortFeaturesV10 features = OpenflowUtils.createPortFeatures(4095L);
+        Assert.assertEquals("Wrong port features", new PortFeaturesV10(true, true, true, true, true, true, true,
+                true, true, true, true, true), features);
+
+        features = OpenflowUtils.createPortFeatures(0L);
+        Assert.assertEquals("Wrong port features", new PortFeaturesV10(false, false, false, false, false, false,
+                false, false, false, false, false, false), features);
+    }
+}
\ No newline at end of file