Bug 5540 - GroupConvertor, GroupStatsConvertor, GroupDescStatsConvertor

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / GroupStatsResponseConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java
index df7a13546010cb0bec85c1e351fa7eebfdb7417e..64531a5320c147f37e0c0197d07f55fdd18030a2 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java
@@ -12,6 +12,7 @@ import java.math.BigInteger;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
+import java.util.Optional;\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.buckets.BucketCounter;\r
@@ -27,8 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  */\r
 public class GroupStatsResponseConvertorTest {\r
 \r
-    GroupStatsResponseConvertor convertor =  new GroupStatsResponseConvertor();\r
-\r
     /**\r
      * Test empty GroupStats conversion\r
      */\r
@@ -36,10 +35,10 @@ public class GroupStatsResponseConvertorTest {
     public void testEmptyGroupStats() {\r
         List<GroupStats> groupStats = new ArrayList<>();\r
 \r
-        List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats> salGroupStats = convertor.toSALGroupStatsList(groupStats);\r
+        Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
+                .GroupStats>> salGroupStats = ConvertorManager.getInstance().convert(groupStats);\r
 \r
-        Assert.assertEquals("Wrong group stats size", 0, salGroupStats.size());\r
+        Assert.assertFalse("Group stats response should be not present", salGroupStats.isPresent());\r
     }\r
 \r
     /**\r
@@ -58,12 +57,15 @@ public class GroupStatsResponseConvertorTest {
         statsBuilder.setBucketStats(new ArrayList<BucketStats>());\r
         groupStats.add(statsBuilder.build());\r
 \r
+        Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
+                .GroupStats>> salGroupStatsOptional = ConvertorManager.getInstance().convert(groupStats);\r
+        Assert.assertTrue("Group stats response convertor not found", salGroupStatsOptional.isPresent());\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats> salGroupStats = convertor.toSALGroupStatsList(groupStats);\r
+                .GroupStats> salGroupStats = salGroupStatsOptional.get();\r
 \r
         Assert.assertEquals("Wrong group stats size", 1, salGroupStats.size());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats stat = salGroupStats.get(0);\r
+                .GroupStats stat = salGroupStats.get(0);\r
         Assert.assertEquals("Wrong group-id", 42, stat.getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong ref-count", 24, stat.getRefCount().getValue().intValue());\r
         Assert.assertEquals("Wrong packet count", 54321, stat.getPacketCount().getValue().intValue());\r
@@ -98,12 +100,15 @@ public class GroupStatsResponseConvertorTest {
         statsBuilder.setBucketStats(new ArrayList<BucketStats>());\r
         groupStats.add(statsBuilder.build());\r
 \r
+        Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
+                .GroupStats>> salGroupStatsOptional = ConvertorManager.getInstance().convert(groupStats);\r
+        Assert.assertTrue("Group stats response convertor not found", salGroupStatsOptional.isPresent());\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats> salGroupStats = convertor.toSALGroupStatsList(groupStats);\r
+                .GroupStats> salGroupStats = salGroupStatsOptional.get();\r
 \r
         Assert.assertEquals("Wrong group stats size", 2, salGroupStats.size());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats stat = salGroupStats.get(0);\r
+                .GroupStats stat = salGroupStats.get(0);\r
         Assert.assertEquals("Wrong group-id", 42, stat.getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong key", 42, stat.getKey().getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong ref-count", 24, stat.getRefCount().getValue().intValue());\r
@@ -148,12 +153,15 @@ public class GroupStatsResponseConvertorTest {
         statsBuilder.setBucketStats(bucketStats);\r
         groupStats.add(statsBuilder.build());\r
 \r
+        Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
+                .GroupStats>> salGroupStatsOptional = ConvertorManager.getInstance().convert(groupStats);\r
+        Assert.assertTrue("Group stats response convertor not found", salGroupStatsOptional.isPresent());\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats> salGroupStats = convertor.toSALGroupStatsList(groupStats);\r
+                .GroupStats> salGroupStats = salGroupStatsOptional.get();\r
 \r
         Assert.assertEquals("Wrong group stats size", 1, salGroupStats.size());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-        .GroupStats stat = salGroupStats.get(0);\r
+                .GroupStats stat = salGroupStats.get(0);\r
         Assert.assertEquals("Wrong group-id", 42, stat.getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong ref-count", 24, stat.getRefCount().getValue().intValue());\r
         Assert.assertEquals("Wrong packet count", 54321, stat.getPacketCount().getValue().intValue());\r
@@ -169,4 +177,4 @@ public class GroupStatsResponseConvertorTest {
         Assert.assertEquals("Wrong bucket packet count", 456, list.get(1).getPacketCount().getValue().intValue());\r
         Assert.assertEquals("Wrong bucket byte count", 123, list.get(1).getByteCount().getValue().intValue());\r
     }\r
-}
\ No newline at end of file
+}\r