Update MRI projects for Aluminium

[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 9384121a978d67ad600f86428588060a73649062..9185c4a428b578e85d5aa1eaf53d06d2218c81b4 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
@@ -120,20 +120,20 @@ 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()
@@ -142,11 +142,12 @@ public class GroupUtilTest {
                 .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());
     }
@@ -164,7 +165,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
@@ -196,7 +197,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