Merge "Migrate openflowplugin tests to use Uint types"

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / MeterConfigStatsResponseConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertorTest.java
index 93608292c914111c3b6e4ea88ec1f0e7e68a3ab9..f64830ca584b49c484ea4d07a6e995e73112ceb0 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertorTest.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.openflow.md.core.sal.convertor;
 
 import static org.junit.Assert.assertEquals;
@@ -33,15 +32,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.meter.config.Bands;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.meter.config.BandsBuilder;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class MeterConfigStatsResponseConvertorTest {
     private static final int PRESET_COUNT = 7;
 
-    private List<MeterConfig> createMeterConfigList(){
+    private List<MeterConfig> createMeterConfigList() {
         List<MeterConfig> meterConfigs = new ArrayList<>();
         MeterConfigBuilder meterConfigBuilder = new MeterConfigBuilder();
         for (int i = 0; i < PRESET_COUNT; i++) {
-            meterConfigBuilder.setMeterId(new MeterId((long) i));
+            meterConfigBuilder.setMeterId(new MeterId(Uint32.valueOf(i)));
             List<Bands> bandses = new ArrayList<>();
 
             BandsBuilder bandsBuilder = new BandsBuilder();
@@ -77,13 +77,14 @@ public class MeterConfigStatsResponseConvertorTest {
      */
     public void testToSALMeterConfigList() {
         final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
-        Optional<List<MeterConfigStats>> meterConfigsOptional = convertorManager.convert(createMeterConfigList(), new VersionConvertorData(OFConstants.OFP_VERSION_1_3));
+        Optional<List<MeterConfigStats>> meterConfigsOptional = convertorManager.convert(createMeterConfigList(),
+                new VersionConvertorData(OFConstants.OFP_VERSION_1_3));
         List<MeterConfigStats> meterConfigs = meterConfigsOptional.orElse(Collections.emptyList());
 
         assertEquals(PRESET_COUNT, meterConfigs.size());
         int cnt = 0;
-        for (MeterConfigStats meterConfigStats: meterConfigs){
-            assertEquals(new Long(cnt), meterConfigStats.getMeterId().getValue());
+        for (MeterConfigStats meterConfigStats: meterConfigs) {
+            assertEquals(cnt, meterConfigStats.getMeterId().getValue().toJava());
             assertTrue(meterConfigStats.getFlags().isMeterBurst());
             assertFalse(meterConfigStats.getFlags().isMeterKbps());
             assertTrue(meterConfigStats.getFlags().isMeterPktps());
@@ -93,13 +94,11 @@ public class MeterConfigStatsResponseConvertorTest {
         }
     }
 
-
-    private final class MockMeterBandBuilder implements org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.MeterBand {
-
+    private final class MockMeterBandBuilder implements org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
+            .protocol.rev130731.meter.band.header.MeterBand {
         @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
+        public Class<? extends DataContainer> implementedInterface() {
             return MockMeterBandBuilder.class;
         }
     }
-
-}
\ No newline at end of file
+}