Bump MRI upstreams

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / multipart / MultipartReplyGroupFeaturesDeserializerTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java
index 416c4c37db26e380e66c6a81d73b7c503181ef35..22a929b83565438ee6547cf96afc039dee85ce0b 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java
@@ -15,6 +15,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.reply.multipart.reply.body.MultipartReplyGroupFeatures;
@@ -26,10 +27,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupSelect;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class MultipartReplyGroupFeaturesDeserializerTest extends AbstractMultipartDeserializerTest {
-    private static final List<Long> MAX_GROUPS_LIST = Arrays.asList(1L, 2L, 3L, 4L);
-    private static final List<Long> ACTIONS_LIST = Arrays.asList(5L, 6L, 7L, 8L);
+    private static final List<Uint32> MAX_GROUPS_LIST = Arrays.asList(Uint32.valueOf(1),
+        Uint32.valueOf(2), Uint32.valueOf(3), Uint32.valueOf(4));
+    private static final List<Uint32> ACTIONS_LIST = Arrays.asList(Uint32.valueOf(5), Uint32.valueOf(6),
+        Uint32.valueOf(7), Uint32.valueOf(8));
 
     private static final List<GroupTypes> GROUP_TYPES_SUPPORTED = Arrays.asList(
             GroupTypes.GroupAll,
@@ -60,11 +64,11 @@ public class MultipartReplyGroupFeaturesDeserializerTest extends AbstractMultipa
         buffer.writeInt(bitMaskGroups);
         buffer.writeInt(bitMaskCapabilities);
 
-        for (Long group: MAX_GROUPS_LIST) {
+        for (Uint32 group : MAX_GROUPS_LIST) {
             buffer.writeInt(group.intValue());
         }
 
-        for (Long action: ACTIONS_LIST) {
+        for (Uint32 action: ACTIONS_LIST) {
             buffer.writeInt(action.intValue());
         }
 
@@ -72,14 +76,8 @@ public class MultipartReplyGroupFeaturesDeserializerTest extends AbstractMultipa
         assertTrue(reply.getActions().containsAll(ACTIONS_LIST));
         assertTrue(reply.getMaxGroups().containsAll(MAX_GROUPS_LIST));
 
-        assertEquals(GROUP_TYPES_SUPPORTED.size(), reply.getGroupTypesSupported().size());
-        assertEquals(GroupAll.class, reply.getGroupTypesSupported().get(0));
-        assertEquals(GroupSelect.class, reply.getGroupTypesSupported().get(1));
-        assertEquals(GroupIndirect.class, reply.getGroupTypesSupported().get(2));
-
-        assertEquals(GROUP_CAPABILITIES_SUPPORTED.size(), reply.getGroupCapabilitiesSupported().size());
-        assertEquals(Chaining.class, reply.getGroupCapabilitiesSupported().get(0));
-        assertEquals(ChainingChecks.class, reply.getGroupCapabilitiesSupported().get(1));
+        assertEquals(Set.of(GroupAll.class, GroupSelect.class, GroupIndirect.class), reply.getGroupTypesSupported());
+        assertEquals(Set.of(Chaining.class, ChainingChecks.class), reply.getGroupCapabilitiesSupported());
 
         assertEquals(0, buffer.readableBytes());
     }