Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Modernize codebase
[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / services / direct / singlelayer / MeterDirectStatisticsServiceTest.java
diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
index e9806c3a0af8371ba7170cfd9876b6cbdabbea93..543d6efaf345c500ae1c1f38a7a9e03a0a028229 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
@@ -11,21 +11,16 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
 import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractDirectStatisticsServiceTest;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter32;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter64;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart.reply.body.MultipartReplyMeterStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.request.multipart.request.body.MultipartRequestMeterStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
@@ -33,11 +28,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.MeterBandStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStatsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStatsKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReplyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartRequest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
 
@@ -55,13 +49,11 @@ public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
 
     @Override
     public void testBuildRequestBody() {
-        final GetMeterStatisticsInput input = mock(GetMeterStatisticsInput.class);
-
-        lenient().when(input.getNode()).thenReturn(createNodeRef(NODE_ID));
-        when(input.getMeterId()).thenReturn(new MeterId(METER_NO));
-
-        final MultipartRequestMeterStats body = (MultipartRequestMeterStats) ((MultipartRequest) service
-            .buildRequest(new Xid(Uint32.valueOf(42L)), input))
+        final var body = (MultipartRequestMeterStats) ((MultipartRequest) service
+            .buildRequest(new Xid(Uint32.valueOf(42L)), new GetMeterStatisticsInputBuilder()
+                .setMeterId(new MeterId(METER_NO))
+                .setNode(createNodeRef(NODE_ID))
+                .build()))
             .getMultipartRequestBody();
 
         assertEquals(METER_NO, body.getStatMeterId().getValue());
@@ -69,27 +61,21 @@ public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
 
     @Override
     public void testBuildReply() {
-        final MeterStats meterStat = new MeterStatsBuilder()
-                .setMeterId(new MeterId(METER_NO))
-                .setByteInCount(new Counter64(Uint64.ONE))
-                .setPacketInCount(new Counter64(Uint64.ONE))
-                .setDuration(new DurationBuilder()
+        final var output = service.buildReply(List.of(new MultipartReplyBuilder()
+            .setMultipartReplyBody(new MultipartReplyMeterStatsBuilder()
+                .setMeterStats(BindingMap.of(new MeterStatsBuilder()
+                    .setMeterId(new MeterId(METER_NO))
+                    .setByteInCount(new Counter64(Uint64.ONE))
+                    .setPacketInCount(new Counter64(Uint64.ONE))
+                    .setDuration(new DurationBuilder()
                         .setSecond(new Counter32(Uint32.ONE))
                         .setNanosecond(new Counter32(Uint32.ONE))
                         .build())
-                .setFlowCount(new Counter32(Uint32.ZERO))
-                .setMeterBandStats(new MeterBandStatsBuilder().build())
-                .build();
-
-        final MultipartReply reply = new MultipartReplyBuilder()
-                .setMultipartReplyBody(new MultipartReplyMeterStatsBuilder()
-                        .setMeterStats(Collections.singletonMap(meterStat.key(), meterStat))
-                        .build())
-                .build();
-
-        final List<MultipartReply> input = Collections.singletonList(reply);
-
-        final GetMeterStatisticsOutput output = service.buildReply(input, true);
+                    .setFlowCount(new Counter32(Uint32.ZERO))
+                    .setMeterBandStats(new MeterBandStatsBuilder().build())
+                    .build()))
+                .build())
+            .build()), true);
         assertTrue(output.nonnullMeterStats().size() > 0);
 
         final MeterStats stats = output.nonnullMeterStats().values().iterator().next();
@@ -98,19 +84,13 @@ public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
 
     @Override
     public void testStoreStatistics() {
-        final org.opendaylight.yang.gen.v1.urn
-                .opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats stat =
-                mock(org.opendaylight.yang.gen.v1.urn
-                        .opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats.class);
-        when(stat.getMeterId()).thenReturn(new MeterId(METER_NO));
-
-        final Map<MeterStatsKey, org.opendaylight.yang.gen.v1.urn
-                .opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats>
-                stats = Collections.singletonMap(stat.key(), stat);
-        final GetMeterStatisticsOutput output = mock(GetMeterStatisticsOutput.class);
-        when(output.nonnullMeterStats()).thenReturn(stats);
-
-        multipartWriterProvider.lookup(MultipartType.OFPMPMETER).get().write(output, true);
+        multipartWriterProvider.lookup(MultipartType.OFPMPMETER).orElseThrow()
+            .write(new GetMeterStatisticsOutputBuilder()
+                .setMeterStats(BindingMap.of(new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918
+                    .meter.statistics.reply.MeterStatsBuilder()
+                    .setMeterId(new MeterId(METER_NO))
+                    .build()))
+                .build(), true);
         verify(deviceContext).writeToTransactionWithParentsSlow(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
     }
 }
OpenFlow Plugin