Bump MRI upstreams

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

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java
index 7fa7ebcb02fae15ef3bc12af822d8cd866a999a2..2008329b5fe7628899b7f76398f15b84d7f2648c 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java
@@ -5,13 +5,13 @@
  * 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 com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Assert;
 import org.junit.Test;
@@ -29,10 +29,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.Ad
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.BatchMeterOutputListGrouping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.batch.meter.output.list.grouping.BatchFailedMetersOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.batch.meter.output.list.grouping.BatchFailedMetersOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.batch.meter.output.list.grouping.BatchFailedMetersOutputKey;
 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 MeterUtil}.
@@ -40,8 +44,8 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 public class MeterUtilTest {
 
     public static final NodeId DUMMY_NODE_ID = new NodeId("dummyNodeId");
-    private static final MeterId DUMMY_METER_ID = new MeterId(42L);
-    private static final MeterId DUMMY_METER_ID_2 = new MeterId(43L);
+    private static final MeterId DUMMY_METER_ID = new MeterId(Uint32.valueOf(42));
+    private static final MeterId DUMMY_METER_ID_2 = new MeterId(Uint32.valueOf(43));
 
     @Test
     public void testBuildGroupPath() {
@@ -65,7 +69,7 @@ public class MeterUtilTest {
         final RpcResult<List<BatchFailedMetersOutput>> output = function.apply(Lists.newArrayList(
                 RpcResultBuilder.success("a").build(),
                 RpcResultBuilder.<String>failed()
-                        .withError(RpcError.ErrorType.APPLICATION, "ut-meter-error")
+                        .withError(ErrorType.APPLICATION, "ut-meter-error")
                         .build()));
 
         Assert.assertFalse(output.isSuccessful());
@@ -74,7 +78,7 @@ public class MeterUtilTest {
         Assert.assertEquals(1, output.getResult().get(0).getBatchOrder().intValue());
     }
 
-    private org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter createBatchMeter(
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter createBatchMeter(
             final MeterId meterId) {
         return new MeterBuilder()
                 .setMeterId(meterId)
@@ -117,33 +121,35 @@ public class MeterUtilTest {
         checkBatchSuccessOutcomeTransformation(MeterUtil.METER_UPDATE_TRANSFORM.apply(input));
     }
 
-    private <T extends BatchMeterOutputListGrouping> void checkBatchSuccessOutcomeTransformation(
+    private static <T extends BatchMeterOutputListGrouping> void checkBatchSuccessOutcomeTransformation(
             final RpcResult<T> output) {
         Assert.assertTrue(output.isSuccessful());
-        Assert.assertEquals(0, output.getResult().getBatchFailedMetersOutput().size());
+        Assert.assertEquals(0, output.getResult().nonnullBatchFailedMetersOutput().size());
         Assert.assertEquals(0, output.getErrors().size());
     }
 
-    private RpcResult<List<BatchFailedMetersOutput>> createEmptyBatchOutcome() {
+    private static RpcResult<List<BatchFailedMetersOutput>> createEmptyBatchOutcome() {
         return RpcResultBuilder
                 .success(Collections.<BatchFailedMetersOutput>emptyList())
                 .build();
     }
 
-    private RpcResult<List<BatchFailedMetersOutput>> createBatchOutcomeWithError() {
+    private static RpcResult<List<BatchFailedMetersOutput>> createBatchOutcomeWithError() {
         return RpcResultBuilder.<List<BatchFailedMetersOutput>>failed()
-                .withError(RpcError.ErrorType.APPLICATION, "ut-flowAddFail")
-                .withResult(Collections.singletonList(new BatchFailedMetersOutputBuilder()
+                .withError(ErrorType.APPLICATION, "ut-flowAddFail")
+                .withResult(List.of(new BatchFailedMetersOutputBuilder()
+                        .setBatchOrder(Uint16.ZERO)
                         .setMeterId(DUMMY_METER_ID)
                         .build()))
                 .build();
     }
 
-    private <T extends BatchMeterOutputListGrouping> void checkBatchErrorOutcomeTransformation(
+    private static <T extends BatchMeterOutputListGrouping> void checkBatchErrorOutcomeTransformation(
             final RpcResult<T> output) {
         Assert.assertFalse(output.isSuccessful());
-        Assert.assertEquals(1, output.getResult().getBatchFailedMetersOutput().size());
-        Assert.assertEquals(DUMMY_METER_ID, output.getResult().getBatchFailedMetersOutput().get(0).getMeterId());
+        Assert.assertEquals(1, output.getResult().nonnullBatchFailedMetersOutput().size());
+        Assert.assertEquals(DUMMY_METER_ID,
+            output.getResult().nonnullBatchFailedMetersOutput().values().iterator().next().getMeterId());
 
         Assert.assertEquals(1, output.getErrors().size());
     }
@@ -161,7 +167,9 @@ public class MeterUtilTest {
 
         Assert.assertTrue(composite.isSuccessful());
         Assert.assertEquals(0, composite.getErrors().size());
-        Assert.assertEquals(0, composite.getResult().getBatchFailedMetersOutput().size());
+        Map<BatchFailedMetersOutputKey, BatchFailedMetersOutput> failedMeters
+                = composite.getResult().nonnullBatchFailedMetersOutput();
+        Assert.assertEquals(0, failedMeters.size());
     }
 
     @Test
@@ -193,7 +201,9 @@ public class MeterUtilTest {
 
         Assert.assertFalse(composite.isSuccessful());
         Assert.assertEquals(1, composite.getErrors().size());
-        Assert.assertEquals(0, composite.getResult().getBatchFailedMetersOutput().size());
+        Map<BatchFailedMetersOutputKey, BatchFailedMetersOutput> failedMeters
+                = composite.getResult().nonnullBatchFailedMetersOutput();
+        Assert.assertEquals(0, failedMeters.size());
     }
 
     @Test
@@ -212,25 +222,25 @@ public class MeterUtilTest {
         Assert.assertEquals(1, composite.getResult().getBatchFailedMetersOutput().size());
     }
 
-    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<AddMetersBatchOutput> createAddMetersBatchSuccessOutput() {
+    private static RpcResult<AddMetersBatchOutput> createAddMetersBatchSuccessOutput() {
         return RpcResultBuilder
                 .success(new AddMetersBatchOutputBuilder()
-                        .setBatchFailedMetersOutput(Collections.emptyList())
+                        .setBatchFailedMetersOutput(Map.of())
                         .build())
                 .build();
     }
 
-    private RpcResult<AddMetersBatchOutput> createAddMetersBatchFailureOutcome() {
+    private static RpcResult<AddMetersBatchOutput> createAddMetersBatchFailureOutcome() {
         final RpcResult<List<BatchFailedMetersOutput>> batchOutcomeWithError = createBatchOutcomeWithError();
         return RpcResultBuilder.<AddMetersBatchOutput>failed()
                 .withResult(new AddMetersBatchOutputBuilder()
-                        .setBatchFailedMetersOutput(batchOutcomeWithError.getResult())
+                        .setBatchFailedMetersOutput(BindingMap.ordered(batchOutcomeWithError.getResult()))
                         .build())
                 .withRpcErrors(batchOutcomeWithError.getErrors())
                 .build();