Bump MRI upstreams

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / util / GroupUtilTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java
index 7fde0603270de7e9ccf73931f164a519dfb000f4..e242331c9fe310c9bd67a9c2b6efccb754b2f5f2 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.util;
 
 import static org.junit.Assert.assertEquals;
@@ -33,9 +32,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link GroupUtil}.
@@ -43,9 +45,9 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 public class GroupUtilTest {
 
     private static final NodeId DUMMY_NODE_ID = new NodeId("dummyNodeId");
-    private static final GroupId DUMMY_GROUP_ID = new GroupId(42L);
-    private static final GroupId DUMMY_GROUP_ID_2 = new GroupId(43L);
-    private static final Long GROUP_ACTION_BITMAP =
+    private static final GroupId DUMMY_GROUP_ID = new GroupId(Uint32.valueOf(42));
+    private static final GroupId DUMMY_GROUP_ID_2 = new GroupId(Uint32.valueOf(43));
+    private static final long GROUP_ACTION_BITMAP =
             0b00000000000000000000000000000000000001111111111111001100000000001L;
 
     @Test
@@ -69,7 +71,7 @@ public class GroupUtilTest {
         final RpcResult<List<BatchFailedGroupsOutput>> summary = function.apply(Lists.newArrayList(
                 RpcResultBuilder.success("a").build(),
                 RpcResultBuilder.<String>failed()
-                        .withError(RpcError.ErrorType.APPLICATION, "action-failed reason")
+                        .withError(ErrorType.APPLICATION, "action-failed reason")
                         .build()));
 
         Assert.assertFalse(summary.isSuccessful());
@@ -119,33 +121,35 @@ public class GroupUtilTest {
         checkBatchSuccessOutcomeTransformation(GroupUtil.GROUP_UPDATE_TRANSFORM.apply(input));
     }
 
-    private <T extends BatchGroupOutputListGrouping> void checkBatchSuccessOutcomeTransformation(
+    private static <T extends BatchGroupOutputListGrouping> void checkBatchSuccessOutcomeTransformation(
             final RpcResult<T> output) {
         Assert.assertTrue(output.isSuccessful());
-        Assert.assertEquals(0, output.getResult().getBatchFailedGroupsOutput().size());
+        Assert.assertEquals(0, output.getResult().nonnullBatchFailedGroupsOutput().size());
         Assert.assertEquals(0, output.getErrors().size());
     }
 
-    private RpcResult<List<BatchFailedGroupsOutput>> createEmptyBatchOutcome() {
+    private static RpcResult<List<BatchFailedGroupsOutput>> createEmptyBatchOutcome() {
         return RpcResultBuilder
                 .success(Collections.<BatchFailedGroupsOutput>emptyList())
                 .build();
     }
 
-    private RpcResult<List<BatchFailedGroupsOutput>> createBatchOutcomeWithError() {
+    private static RpcResult<List<BatchFailedGroupsOutput>> createBatchOutcomeWithError() {
         return RpcResultBuilder.<List<BatchFailedGroupsOutput>>failed()
-                .withError(RpcError.ErrorType.APPLICATION, "ut-flowAddFail")
-                .withResult(Collections.singletonList(new BatchFailedGroupsOutputBuilder()
+                .withError(ErrorType.APPLICATION, "ut-flowAddFail")
+                .withResult(List.of(new BatchFailedGroupsOutputBuilder()
+                        .setBatchOrder(Uint16.ZERO)
                         .setGroupId(DUMMY_GROUP_ID)
                         .build()))
                 .build();
     }
 
-    private <T extends BatchGroupOutputListGrouping> void checkBatchErrorOutcomeTransformation(
+    private static <T extends BatchGroupOutputListGrouping> void checkBatchErrorOutcomeTransformation(
             final RpcResult<T> output) {
         Assert.assertFalse(output.isSuccessful());
-        Assert.assertEquals(1, output.getResult().getBatchFailedGroupsOutput().size());
-        Assert.assertEquals(DUMMY_GROUP_ID, output.getResult().getBatchFailedGroupsOutput().get(0).getGroupId());
+        Assert.assertEquals(1, output.getResult().nonnullBatchFailedGroupsOutput().size());
+        Assert.assertEquals(DUMMY_GROUP_ID,
+            output.getResult().nonnullBatchFailedGroupsOutput().values().iterator().next().getGroupId());
 
         Assert.assertEquals(1, output.getErrors().size());
     }
@@ -163,7 +167,7 @@ public class GroupUtilTest {
 
         Assert.assertTrue(composite.isSuccessful());
         Assert.assertEquals(0, composite.getErrors().size());
-        Assert.assertEquals(0, composite.getResult().getBatchFailedGroupsOutput().size());
+        Assert.assertEquals(0, composite.getResult().nonnullBatchFailedGroupsOutput().size());
     }
 
     @Test
@@ -195,7 +199,7 @@ public class GroupUtilTest {
 
         Assert.assertFalse(composite.isSuccessful());
         Assert.assertEquals(1, composite.getErrors().size());
-        Assert.assertEquals(0, composite.getResult().getBatchFailedGroupsOutput().size());
+        Assert.assertEquals(0, composite.getResult().nonnullBatchFailedGroupsOutput().size());
     }
 
     @Test
@@ -218,32 +222,31 @@ public class GroupUtilTest {
     public void testExtractGroupActionsSupportBitmap() {
         ActionType actionSupported = new ActionType(true,true, true, true, true, true, true, true, true, true, true,
                 true, true, true, true, true, true);
-        final List<Long> groupActionsSupportBitmap =
+        final List<Uint32> groupActionsSupportBitmap =
                 GroupUtil.extractGroupActionsSupportBitmap(Lists.newArrayList(actionSupported));
         assertEquals(1, groupActionsSupportBitmap.size());
-        final Long bitmap = groupActionsSupportBitmap.get(0);
-        assertEquals(GROUP_ACTION_BITMAP, bitmap);
+        assertEquals(GROUP_ACTION_BITMAP,  groupActionsSupportBitmap.get(0).toJava());
     }
 
-    private RpcResult<SendBarrierOutput> createBarrierFailureOutcome() {
+    private static RpcResult<SendBarrierOutput> createBarrierFailureOutcome() {
         return RpcResultBuilder.<SendBarrierOutput>failed()
-                .withError(RpcError.ErrorType.APPLICATION, "ut-barrier-error")
+                .withError(ErrorType.APPLICATION, "ut-barrier-error")
                 .build();
     }
 
-    private RpcResult<AddGroupsBatchOutput> createAddGroupsBatchSuccessOutput() {
+    private static RpcResult<AddGroupsBatchOutput> createAddGroupsBatchSuccessOutput() {
         return RpcResultBuilder
                 .success(new AddGroupsBatchOutputBuilder()
-                        .setBatchFailedGroupsOutput(Collections.emptyList())
+                        .setBatchFailedGroupsOutput(Collections.emptyMap())
                         .build())
                 .build();
     }
 
-    private RpcResult<AddGroupsBatchOutput> createAddGroupsBatchFailureOutcome() {
+    private static RpcResult<AddGroupsBatchOutput> createAddGroupsBatchFailureOutcome() {
         final RpcResult<List<BatchFailedGroupsOutput>> batchOutcomeWithError = createBatchOutcomeWithError();
         return RpcResultBuilder.<AddGroupsBatchOutput>failed()
                 .withResult(new AddGroupsBatchOutputBuilder()
-                        .setBatchFailedGroupsOutput(batchOutcomeWithError.getResult())
+                        .setBatchFailedGroupsOutput(BindingMap.ordered(batchOutcomeWithError.getResult()))
                         .build())
                 .withRpcErrors(batchOutcomeWithError.getErrors())
                 .build();