Update MRI projects for Aluminium

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertorTest.java
index f66a6e2a47080c2821651edf92d3caeae9869413..6e51f5d770a55c996b3ea425b313e2d3d121173b 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertorTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import org.junit.Assert;
@@ -79,7 +80,7 @@ public class GroupDescStatsResponseConvertorTest {
         Assert.assertEquals("Wrong type", GroupTypes.GroupAll, stat.getGroupType());
         Assert.assertEquals("Wrong group-id", 42, stat.getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong key", 42, stat.key().getGroupId().getValue().intValue());
-        Assert.assertEquals("Wrong buckets size", 0, stat.getBuckets().getBucket().size());
+        Assert.assertEquals("Wrong buckets size", 0, stat.getBuckets().nonnullBucket().size());
     }
 
     /**
@@ -179,10 +180,11 @@ public class GroupDescStatsResponseConvertorTest {
         Assert.assertEquals("Wrong type", GroupTypes.GroupFf, stat.getGroupType());
         Assert.assertEquals("Wrong group-id", 42, stat.getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong key", 42, stat.key().getGroupId().getValue().intValue());
-        Assert.assertEquals("Wrong buckets size", 1, stat.getBuckets().getBucket().size());
+        Assert.assertEquals("Wrong buckets size", 1, stat.getBuckets().nonnullBucket().size());
 
         // Test first bucket for first group desc
-        Bucket bucket = stat.getBuckets().getBucket().get(0);
+        Iterator<Bucket> bucketIt = stat.getBuckets().nonnullBucket().values().iterator();
+        Bucket bucket = bucketIt.next();
         Assert.assertEquals("Wrong type", 0, bucket.key().getBucketId().getValue().intValue());
         Assert.assertEquals("Wrong type", 0, bucket.getBucketId().getValue().intValue());
         Assert.assertEquals("Wrong type", 16, bucket.getWeight().intValue());
@@ -192,10 +194,10 @@ public class GroupDescStatsResponseConvertorTest {
 
         // Test first action for first bucket for first group desc
         org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list
-                .Action action = bucket.getAction().get(0);
+                .Action action = bucket.nonnullAction().values().iterator().next();
         Assert.assertEquals("Wrong type", 0, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.CopyTtlInCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.CopyTtlInCase", action.getAction().implementedInterface().getName());
 
         // **********************************************
         // Test second group desc
@@ -204,43 +206,45 @@ public class GroupDescStatsResponseConvertorTest {
         Assert.assertEquals("Wrong type", GroupTypes.GroupIndirect, stat.getGroupType());
         Assert.assertEquals("Wrong group-id", 50, stat.getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong key", 50, stat.key().getGroupId().getValue().intValue());
-        Assert.assertEquals("Wrong buckets size", 2, stat.getBuckets().getBucket().size());
+        Assert.assertEquals("Wrong buckets size", 2, stat.getBuckets().nonnullBucket().size());
 
         // Test first bucket for second group desc
-        bucket = stat.getBuckets().getBucket().get(0);
+        bucketIt = stat.getBuckets().nonnullBucket().values().iterator();
+        bucket = bucketIt.next();
         Assert.assertEquals("Wrong type", 0, bucket.key().getBucketId().getValue().intValue());
         Assert.assertEquals("Wrong type", 0, bucket.getBucketId().getValue().intValue());
         Assert.assertEquals("Wrong type", 100, bucket.getWeight().intValue());
         Assert.assertEquals("Wrong type", 400, bucket.getWatchGroup().intValue());
         Assert.assertEquals("Wrong type", 200, bucket.getWatchPort().intValue());
-        Assert.assertEquals("Wrong type", 3, bucket.getAction().size());
+        Assert.assertEquals("Wrong type", 3, bucket.nonnullAction().size());
 
         // Test first action for first bucket of second group desc
-        action = bucket.getAction().get(0);
+        var actionIt = bucket.nonnullAction().values().iterator();
+        action = actionIt.next();
         Assert.assertEquals("Wrong type", 0, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.CopyTtlOutCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.CopyTtlOutCase", action.getAction().implementedInterface().getName());
 
         // Test second action for first bucket of second group desc
-        action = bucket.getAction().get(1);
+        action = actionIt.next();
         Assert.assertEquals("Wrong type", 1, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.DecNwTtlCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.DecNwTtlCase", action.getAction().implementedInterface().getName());
 
         // Test third action for first bucket of second group desc
-        action = bucket.getAction().get(2);
+        action = actionIt.next();
         Assert.assertEquals("Wrong type", 2, action.getOrder().intValue());
         Assert.assertEquals("Wrong type", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112"
-                + ".action.action.PopPbbActionCase", action.getAction().getImplementedInterface().getName());
+                + ".action.action.PopPbbActionCase", action.getAction().implementedInterface().getName());
 
         // Test second bucket for second group desc
-        bucket = stat.getBuckets().getBucket().get(1);
+        bucket = bucketIt.next();
         Assert.assertEquals("Wrong type", 1, bucket.key().getBucketId().getValue().intValue());
         Assert.assertEquals("Wrong type", 1, bucket.getBucketId().getValue().intValue());
         Assert.assertEquals("Wrong type", 5, bucket.getWeight().intValue());
         Assert.assertEquals("Wrong type", 15, bucket.getWatchGroup().intValue());
         Assert.assertEquals("Wrong type", 10, bucket.getWatchPort().intValue());
-        Assert.assertEquals("Wrong type", 0, bucket.getAction().size());
+        Assert.assertEquals("Wrong type", 0, bucket.nonnullAction().size());
     }
 
     private List<GroupDescStats> convert(List<GroupDesc> groupDescStats,VersionConvertorData data) {