new serialization factories and tests

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / SetAsyncInputMessageFactoryTest.java

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java
index c9952e87e6d0a82a1f9be7ebf077fb0a9f2c5571..54395ca9e776582cf9bfcf9b5185baf9ffe5e674 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java
@@ -41,9 +41,9 @@ public class SetAsyncInputMessageFactoryTest {
         factory.messageToBuffer(HelloMessageFactoryTest.VERSION_YET_SUPPORTED, out, message);\r
         \r
         BufferHelper.checkHeaderV13(out, factory.getMessageType(), factory.computeLength());\r
-        Assert.assertTrue("Wrong packetInMask", comparePIRLists(message.getPacketInMask(), readPacketInMask(out)));\r
-        Assert.assertTrue("Wrong packetInMask", comparePortReasonLists(message.getPortStatusMask(), readPortStatusMask(out)));\r
-        Assert.assertTrue("Wrong packetInMask", compareFlowRemovedReasonLists(message.getFlowRemovedMask(), readFlowRemovedReasonMask(out)));\r
+        Assert.assertEquals("Wrong packetInMask", message.getPacketInMask(), readPacketInMask(out));\r
+        Assert.assertEquals("Wrong packetInMask", message.getPortStatusMask(), readPortStatusMask(out));\r
+        Assert.assertEquals("Wrong packetInMask", message.getFlowRemovedMask(), readFlowRemovedReasonMask(out));\r
         \r
     }\r
     \r
@@ -91,9 +91,9 @@ public class SetAsyncInputMessageFactoryTest {
     \r
     private static PacketInReason readPacketInReason(int input) {\r
         PacketInReason reason = null;\r
-        Boolean OFPRNOMATCH = (input & (1 << 0)) > 0;\r
-        Boolean OFPRACTION = (input & (1 << 1)) > 0;\r
-        Boolean OFPRINVALIDTTL = (input & (1 << 2)) > 0;\r
+        boolean OFPRNOMATCH = (input & (1 << 0)) > 0;\r
+        boolean OFPRACTION = (input & (1 << 1)) > 0;\r
+        boolean OFPRINVALIDTTL = (input & (1 << 2)) > 0;\r
         \r
         if (OFPRNOMATCH) {\r
             return PacketInReason.forValue(0);\r
@@ -110,9 +110,9 @@ public class SetAsyncInputMessageFactoryTest {
     \r
     private static PortReason readPortReason(int input) {\r
         PortReason reason = null;\r
-        Boolean OFPPRADD = (input & (1 << 0)) > 0;\r
-        Boolean OFPPRDELETE = (input & (1 << 1)) > 0;\r
-        Boolean OFPPRMODIFY = (input & (1 << 2)) > 0;\r
+        boolean OFPPRADD = (input & (1 << 0)) > 0;\r
+        boolean OFPPRDELETE = (input & (1 << 1)) > 0;\r
+        boolean OFPPRMODIFY = (input & (1 << 2)) > 0;\r
         \r
         if (OFPPRADD) {\r
             return PortReason.forValue(0);\r
@@ -129,10 +129,10 @@ public class SetAsyncInputMessageFactoryTest {
     \r
     private static FlowRemovedReason readFlowRemovedReason(int input) {\r
         FlowRemovedReason reason = null;\r
-        Boolean OFPRRIDLETIMEOUT = (input & (1 << 0)) > 0;\r
-        Boolean OFPRRHARDTIMEOUT = (input & (1 << 1)) > 0;\r
-        Boolean OFPRRDELETE = (input & (1 << 2)) > 0;\r
-        Boolean OFPRRGROUPDELETE = (input & (1 << 3)) > 0;\r
+        boolean OFPRRIDLETIMEOUT = (input & (1 << 0)) > 0;\r
+        boolean OFPRRHARDTIMEOUT = (input & (1 << 1)) > 0;\r
+        boolean OFPRRDELETE = (input & (1 << 2)) > 0;\r
+        boolean OFPRRGROUPDELETE = (input & (1 << 3)) > 0;\r
         \r
         if (OFPRRIDLETIMEOUT) {\r
             return FlowRemovedReason.forValue(0);\r
@@ -149,48 +149,4 @@ public class SetAsyncInputMessageFactoryTest {
         \r
         return reason;\r
     }\r
-    \r
-    private static boolean comparePIRLists(List<PacketInReason> fromMessage, List<PacketInReason> fromBuffer) {\r
-        boolean result = false;\r
-        int romMessageLength = fromMessage.size();\r
-        for (int i = 0; i < romMessageLength; i++) {\r
-            if ((fromMessage.get(i).getIntValue()) == (fromBuffer.get(i).getIntValue())) {\r
-                result = true;\r
-            } else {\r
-                result = false;\r
-                break;\r
-            }\r
-        }\r
-        return result;\r
-    }\r
-    \r
-    private static boolean comparePortReasonLists(List<PortReason> fromMessage, \r
-            List<PortReason> fromBuffer) {\r
-        boolean result = false;\r
-        int fromMessageLength = fromMessage.size();\r
-        for (int i = 0; i < fromMessageLength; i++) {\r
-            if ((fromMessage.get(i).getIntValue()) == (fromBuffer.get(i).getIntValue())) {\r
-                result = true;\r
-            } else {\r
-                result = false;\r
-                break;\r
-            }\r
-        }\r
-        return result;\r
-    }\r
-    \r
-    private static boolean compareFlowRemovedReasonLists(List<FlowRemovedReason> fromMessage, \r
-            List<FlowRemovedReason> fromBuffer) {\r
-        boolean result = false;\r
-        int fromMessageLength = fromMessage.size();\r
-        for (int i = 0; i < fromMessageLength; i++) {\r
-            if ((fromMessage.get(i).getIntValue()) == (fromBuffer.get(i).getIntValue())) {\r
-                result = true;\r
-            } else {\r
-                result = false;\r
-                break;\r
-            }\r
-        }\r
-        return result;\r
-    }\r
 }\r