new serialization factories and tests

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

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
index 74c9a378a5787787296c36d3289a8206e3543bdc..01a7d025ac30b49f69af9ae657cae7a119b93fea 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
@@ -32,16 +32,15 @@ public class QueueGetConfigReplyMessageFactoryTest {
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 00 00 00 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 00 02 00 00 00 00 00 00");\r
         GetQueueConfigOutput builtByFactory = BufferHelper.decodeV13(QueueGetConfigReplyMessageFactory.getInstance(), bb);\r
         BufferHelper.checkHeaderV13(builtByFactory);\r
-        Assert.assertTrue("Wrong port",66051L == builtByFactory.getPort().getValue());\r
-        Assert.assertTrue("Wrong queues", true == compareLists(builtByFactory.getQueues(), createQueuesList()));\r
+        Assert.assertEquals("Wrong port", 66051L, builtByFactory.getPort().getValue().longValue());\r
+        Assert.assertEquals("Wrong queues", builtByFactory.getQueues(), createQueuesList());\r
     }\r
     \r
     public List<Queues> createQueuesList(){\r
-        final byte PADDING_IN_PACKET_QUEUE_HEADER = 6;\r
         List<Queues> queuesList = new ArrayList<Queues>();\r
         QueuesBuilder qb = new QueuesBuilder();\r
-        qb.setQueueId(new QueueId((long) 1));\r
-        qb.setPort(new PortNumber((long) 1));\r
+        qb.setQueueId(new QueueId(1L));\r
+        qb.setPort(new PortNumber(1L));\r
         qb.setProperties(createPropertiesList());\r
         queuesList.add(qb.build());\r
         \r
@@ -49,7 +48,6 @@ public class QueueGetConfigReplyMessageFactoryTest {
     }\r
     \r
     public List<Properties> createPropertiesList(){\r
-        final byte PADDING_IN_QUEUE_PROPERTY_HEADER = 4;\r
         List<Properties> propertiesList = new ArrayList<Properties>();\r
         PropertiesBuilder pb = new PropertiesBuilder();\r
         pb.setProperty(QueueProperty.values()[2]);\r
@@ -57,33 +55,4 @@ public class QueueGetConfigReplyMessageFactoryTest {
         \r
         return propertiesList;\r
     }\r
-    \r
-    public boolean compareLists(List<Queues> originalList, List<Queues> testList){\r
-        boolean decision = false;\r
-        int originalListLength = originalList.size();\r
-        int testListLength = testList.size();\r
-        \r
-        for(int i=0; i<originalListLength; i++){\r
-            if(originalList.get(i).getPort().equals(testList.get(i).getPort())) {\r
-                decision = true;\r
-            } else {\r
-                decision = false;\r
-                break;\r
-            }\r
-            if(originalList.get(i).getQueueId().equals(testList.get(i).getQueueId())) {\r
-                decision = true;\r
-            } else {\r
-                decision = false;\r
-                break;\r
-            }\r
-            if(originalList.get(i).getProperties().get(0).getProperty().equals(\r
-                    testList.get(i).getProperties().get(0).getProperty())) {\r
-                decision = true;\r
-            } else {\r
-                decision = false;\r
-                break;\r
-            }\r
-        }\r
-        return decision;\r
-    }\r
 }\r