new serialization factories and tests

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

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
index c8a5b762435a02a27cfc1be76a60e5f25859e67c..535f30edbaa009c88302be2bed5caaae9bd5239f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
@@ -49,7 +49,7 @@ public class MeterModInputMessageFactoryTest {
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readShort());\r
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));\r
         Assert.assertEquals("Wrong meterId", message.getMeterId().getValue().intValue(), out.readUnsignedInt());\r
-        Assert.assertEquals("Wrong bands", true, compareBandsLists(createBandsList(), decodeBandsList(out)));\r
+        Assert.assertEquals("Wrong bands", createBandsList(), decodeBandsList(out));\r
     }\r
     \r
     private static MeterFlags decodeMeterModFlags(short input){\r
@@ -83,34 +83,4 @@ public class MeterModInputMessageFactoryTest {
         bandsList.add(band);\r
         return bandsList;\r
     }\r
-    \r
-    private static boolean compareBandsLists(List<Bands> bandsFromMessage, List<Bands> bandsFromBuffer) {\r
-        boolean result = false;\r
-        int bandsFromMessageLength = bandsFromMessage.size();\r
-        for (int i = 0; i < bandsFromMessageLength; i++) {\r
-            if (bandsFromMessage.get(i).getType().equals(bandsFromBuffer.get(i).getType())) {\r
-                result = true;\r
-            } else {\r
-                result = false;\r
-                break;\r
-            }\r
-            if (bandsFromMessage.get(i).getRate()\r
-                    .equals(bandsFromBuffer.get(i).getRate())) {\r
-                result = true;\r
-            } else {\r
-                result = false;\r
-                break;\r
-            }\r
-            if (bandsFromMessage.get(i).getBurstSize()\r
-                    .equals(bandsFromBuffer.get(i).getBurstSize())) {\r
-                result = true;\r
-            } else {\r
-                result = false;\r
-                break;\r
-            }\r
-        }\r
-     // TODO get method for field length missing\r
-     // TODO actions structure missing\r
-        return result;\r
-    }\r
 }\r