Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Migrate openflow-protocol-impl tests to Uint types
[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / MeterModInputMessageFactoryTest.java
diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
index 115c0755da48db87a6376ba9c5cc37862b640977..4d00442316d5bc0f0b331c9a4995665b9c68f8ec 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
@@ -10,19 +10,17 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId;
@@ -35,8 +33,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.dscp.remark._case.MeterBandDscpRemarkBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.Bands;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.BandsBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
+ * Unit tests for MeterModInputMessageFactory.
+ *
  * @author timotej.kubas
  * @author michal.polkorab
  */
@@ -46,7 +48,7 @@ public class MeterModInputMessageFactoryTest {
     private OFSerializer<MeterModInput> meterModFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -57,8 +59,7 @@ public class MeterModInputMessageFactoryTest {
     }
 
     /**
-     * @throws Exception
-     * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO
+     * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO.
      */
     @Test
     public void testMeterModInputMessage() throws Exception {
@@ -66,7 +67,7 @@ public class MeterModInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setCommand(MeterModCommand.forValue(1));
         builder.setFlags(new MeterFlags(false, true, true, false));
-        builder.setMeterId(new MeterId(2248L));
+        builder.setMeterId(new MeterId(Uint32.valueOf(2248)));
         builder.setBands(createBandsList());
         MeterModInput message = builder.build();
 
@@ -80,54 +81,55 @@ public class MeterModInputMessageFactoryTest {
         Assert.assertEquals("Wrong bands", message.getBands(), decodeBandsList(out));
     }
 
-    private static MeterFlags decodeMeterModFlags(short input){
-        final Boolean _oFPMFKBPS = (input & (1 << 0)) > 0;
-        final Boolean _oFPMFPKTPS = (input & (1 << 1)) > 0;
-        final Boolean _oFPMFBURST = (input & (1 << 2)) > 0;
-        final Boolean _oFPMFSTATS = (input & (1 << 3)) > 0;
+    @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+    private static MeterFlags decodeMeterModFlags(short input) {
+        final Boolean _oFPMFKBPS = (input & 1 << 0) > 0;
+        final Boolean _oFPMFPKTPS = (input & 1 << 1) > 0;
+        final Boolean _oFPMFBURST = (input & 1 << 2) > 0;
+        final Boolean _oFPMFSTATS = (input & 1 << 3) > 0;
         return new MeterFlags(_oFPMFBURST, _oFPMFKBPS, _oFPMFPKTPS, _oFPMFSTATS);
     }
 
-    private static List<Bands> createBandsList(){
-        List<Bands> bandsList = new ArrayList<>();
-        BandsBuilder bandsBuilder = new BandsBuilder();
-        MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
+    private static List<Bands> createBandsList() {
+        final List<Bands> bandsList = new ArrayList<>();
+        final BandsBuilder bandsBuilder = new BandsBuilder();
+        final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
         MeterBandDropBuilder dropBand = new MeterBandDropBuilder();
         dropBand.setType(MeterBandType.OFPMBTDROP);
-        dropBand.setRate(1L);
-        dropBand.setBurstSize(2L);
+        dropBand.setRate(Uint32.ONE);
+        dropBand.setBurstSize(Uint32.TWO);
         dropCaseBuilder.setMeterBandDrop(dropBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dropCaseBuilder.build()).build());
-        MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
+        final MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
         MeterBandDscpRemarkBuilder dscpRemarkBand = new MeterBandDscpRemarkBuilder();
         dscpRemarkBand.setType(MeterBandType.OFPMBTDSCPREMARK);
-        dscpRemarkBand.setRate(1L);
-        dscpRemarkBand.setBurstSize(2L);
-        dscpRemarkBand.setPrecLevel((short) 3);
+        dscpRemarkBand.setRate(Uint32.ONE);
+        dscpRemarkBand.setBurstSize(Uint32.TWO);
+        dscpRemarkBand.setPrecLevel(Uint8.valueOf(3));
         dscpCaseBuilder.setMeterBandDscpRemark(dscpRemarkBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dscpCaseBuilder.build()).build());
         return bandsList;
     }
 
-    private static List<Bands> decodeBandsList(ByteBuf input){
-        List<Bands> bandsList = new ArrayList<>();
-        BandsBuilder bandsBuilder = new BandsBuilder();
-        MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
+    private static List<Bands> decodeBandsList(ByteBuf input) {
+        final List<Bands> bandsList = new ArrayList<>();
+        final BandsBuilder bandsBuilder = new BandsBuilder();
+        final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
         MeterBandDropBuilder dropBand = new MeterBandDropBuilder();
         dropBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
-        input.skipBytes(Short.SIZE/Byte.SIZE);
-        dropBand.setRate(input.readUnsignedInt());
-        dropBand.setBurstSize(input.readUnsignedInt());
+        input.skipBytes(Short.SIZE / Byte.SIZE);
+        dropBand.setRate(Uint32.fromIntBits(input.readInt()));
+        dropBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
         input.skipBytes(4);
         dropCaseBuilder.setMeterBandDrop(dropBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dropCaseBuilder.build()).build());
-        MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
+        final MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
         MeterBandDscpRemarkBuilder dscpRemarkBand = new MeterBandDscpRemarkBuilder();
         dscpRemarkBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
-        input.skipBytes(Short.SIZE/Byte.SIZE);
-        dscpRemarkBand.setRate(input.readUnsignedInt());
-        dscpRemarkBand.setBurstSize(input.readUnsignedInt());
-        dscpRemarkBand.setPrecLevel(input.readUnsignedByte());
+        input.skipBytes(Short.SIZE / Byte.SIZE);
+        dscpRemarkBand.setRate(Uint32.fromIntBits(input.readInt()));
+        dscpRemarkBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
+        dscpRemarkBand.setPrecLevel(Uint8.fromByteBits(input.readByte()));
         input.skipBytes(3);
         dscpCaseBuilder.setMeterBandDscpRemark(dscpRemarkBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dscpCaseBuilder.build()).build());
@@ -135,8 +137,7 @@ public class MeterModInputMessageFactoryTest {
     }
 
     /**
-     * @throws Exception
-     * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO
+     * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO.
      */
     @Test
     public void testMeterModInputMessageWithNoBands() throws Exception {
@@ -144,7 +145,7 @@ public class MeterModInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setCommand(MeterModCommand.forValue(1));
         builder.setFlags(new MeterFlags(false, true, true, false));
-        builder.setMeterId(new MeterId(2248L));
+        builder.setMeterId(new MeterId(Uint32.valueOf(2248)));
         builder.setBands(null);
         MeterModInput message = builder.build();
 
@@ -157,4 +158,4 @@ public class MeterModInputMessageFactoryTest {
         Assert.assertEquals("Wrong meterId", message.getMeterId().getValue().intValue(), out.readUnsignedInt());
         Assert.assertTrue("Unexpected data", out.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
OpenFlow Plugin