Finish test code migration to uint

Fix up the few remaining users of widened types, preparing the floor
for migration of production code.

JIRA: OPNFLWPLUG-1099
Change-Id: I6a2ed96d2859244debd63aa41a16db5c8dc7f7f5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java
index bd93ac62af791c2a9b83c94835bf1f7d88ff9528..2ecd2e83cfd9ad89689cb86fe2398447eac6e44c 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java
@@ -286,10 +286,10 @@ public class SyncPlanPushStrategyFlatBatchImplTest {
     @Test
     public void testMapBatchesToRanges() {
         final List<Batch> inputBatchBag = Lists.newArrayList(
-                new BatchBuilder().setBatchOrder(0).build(),
-                new BatchBuilder().setBatchOrder(5).build(),
-                new BatchBuilder().setBatchOrder(9).build(),
-                new BatchBuilder().setBatchOrder(15).build()
+                new BatchBuilder().setBatchOrder(Uint16.ZERO).build(),
+                new BatchBuilder().setBatchOrder(Uint16.valueOf(5)).build(),
+                new BatchBuilder().setBatchOrder(Uint16.valueOf(9)).build(),
+                new BatchBuilder().setBatchOrder(Uint16.valueOf(15)).build()
         );
         final Map<Range<Uint16>, Batch> rangeBatchMap =
                 SyncPlanPushStrategyFlatBatchImpl.mapBatchesToRanges(inputBatchBag, 42);

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java
index a0c1ed384c0447c4ac090ed59e9b83d3202a88ff..1347b4684f6265b015c064f2c1b6c5cbabdee9bc 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java
@@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmOfArpSpaKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.arp.spa.grouping.NxmOfArpSpaBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link ArpSpaConvertor}.
@@ -73,7 +74,7 @@ public class ArpSpaConvertorTest {
     @Test
     public void testConvertFromOFJava() {
         final ArpSpaValuesBuilder arpSpaValuesBuilder = new ArpSpaValuesBuilder()
-                .setValue(IpConverter.ipv4AddressToLong(IPV4_ADDRESS));
+                .setValue(Uint32.valueOf(IpConverter.ipv4AddressToLong(IPV4_ADDRESS)));
         final ArpSpaCaseValueBuilder arpSpaCaseValueBuilder = new ArpSpaCaseValueBuilder()
                 .setArpSpaValues(arpSpaValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java
index 08c36360c1f6d34fc9da5adf9b9ae5ca8ba22938..dd44edf47c2b1d3522e2de37906982679dd586f1 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java
@@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmOfArpTpaKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.arp.tpa.grouping.NxmOfArpTpaBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link ArpTpaConvertor}.
@@ -74,7 +75,7 @@ public class ArpTpaConvertorTest {
     @Test
     public void testConvertToOFJava() {
         final ArpTpaValuesBuilder arpTpaValuesBuilder = new ArpTpaValuesBuilder()
-                .setValue(IpConverter.ipv4AddressToLong(IPV4_ADDRESS));
+                .setValue(Uint32.valueOf(IpConverter.ipv4AddressToLong(IPV4_ADDRESS)));
         final ArpTpaCaseValueBuilder arpTpaCaseValueBuilder = new ArpTpaCaseValueBuilder()
                 .setArpTpaValues(arpTpaValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java
index 8e3c033d98484bae1afdbbb99dcae2421a633ff0..98e8d17c734c33ea4f4498164e77905ecd220657 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java
@@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxTunIpv4DstKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.tun.ipv4.dst.grouping.NxmNxTunIpv4DstBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link TunIPv4DstConvertor}.
@@ -73,7 +74,7 @@ public class TunIPv4DstConvertorTest {
     @Test
     public void testConvert1() {
         final TunIpv4DstValuesBuilder tunIpv4DstValuesBuilder = new TunIpv4DstValuesBuilder()
-                .setValue(IpConverter.ipv4AddressToLong(IPV4_ADDRESS));
+                .setValue(Uint32.valueOf(IpConverter.ipv4AddressToLong(IPV4_ADDRESS)));
         final TunIpv4DstCaseValueBuilder tunIpv4DstCaseValueBuilder = new TunIpv4DstCaseValueBuilder()
                 .setTunIpv4DstValues(tunIpv4DstValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java
index 144f2aabce83ab99faef5bad213e8b864df8bfb7..998341eacd7769d6c756dfa7039b4b424c78429e 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java
@@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxTunIpv4SrcKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.tun.ipv4.src.grouping.NxmNxTunIpv4SrcBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link TunIPv4SrcConvertor}.
@@ -73,7 +74,7 @@ public class TunIPv4SrcConvertorTest {
     @Test
     public void testConvert1() {
         final TunIpv4SrcValuesBuilder tunIpv4SrcValuesBuilder = new TunIpv4SrcValuesBuilder()
-                .setValue(IpConverter.ipv4AddressToLong(IPV4_ADDRESS));
+                .setValue(Uint32.valueOf(IpConverter.ipv4AddressToLong(IPV4_ADDRESS)));
         final TunIpv4SrcCaseValueBuilder tunIpv4SrcCaseValueBuilder = new TunIpv4SrcCaseValueBuilder()
                 .setTunIpv4SrcValues(tunIpv4SrcValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/BundleTestUtils.java b/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/BundleTestUtils.java
index 6f4bc095e5a28807db1a9e981be0a68b2882c46c..4b8294d6d5ef33cb42fdc65c5f7784c42e887b5c 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/BundleTestUtils.java
+++ b/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/BundleTestUtils.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.extension.onf;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
@@ -14,6 +13,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.common.grouping.BundlePropertyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.property.grouping.bundle.property.entry.BundlePropertyExperimenterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.property.grouping.bundle.property.entry.bundle.property.experimenter.BundlePropertyExperimenterData;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Abstract class for common Converter util methods.
@@ -24,8 +24,8 @@ public abstract class BundleTestUtils {
         return new BundlePropertyBuilder()
                 .setType(BundlePropertyType.ONFETBPTEXPERIMENTER)
                 .setBundlePropertyEntry(new BundlePropertyExperimenterBuilder()
-                        .setExperimenter(new ExperimenterId(1L))
-                        .setExpType(2L)
+                        .setExperimenter(new ExperimenterId(Uint32.ONE))
+                        .setExpType(Uint32.TWO)
                         .setBundlePropertyExperimenterData(data)
                         .build())
                 .build();

diff --git a/openflowjava/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java b/openflowjava/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java
index 27d6f44acfb8f18b58ee166746c6729b22fed921..133561d399b2fe202c47c14250e7dc3488a2ec7e 100644 (file)
--- a/openflowjava/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java
+++ b/openflowjava/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java
@@ -40,6 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.S
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.SystemNotificationsListener;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +50,6 @@ import org.slf4j.LoggerFactory;
  *
  * @author michal.polkorab
  */
-
 public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHandler,
         SystemNotificationsListener, ConnectionReadyListener {
 
@@ -56,7 +57,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
     protected volatile ConnectionAdapter adapter;
     private final SettableFuture<Void> finishedFuture;
     private int idleCounter = 0;
-    private ExecutorService executorService;
+    private final ExecutorService executorService;
 
     public MockPlugin(ExecutorService executorService) {
         LOGGER.trace("Creating MockPlugin");
@@ -88,7 +89,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
         new Thread(() -> {
             LOGGER.debug("MockPlugin.onEchoRequestMessage().run() started adapter: {}", adapter);
             EchoReplyInputBuilder replyBuilder = new EchoReplyInputBuilder();
-            replyBuilder.setVersion((short) 4);
+            replyBuilder.setVersion(Uint8.valueOf(4));
             replyBuilder.setXid(notification.getXid());
             EchoReplyInput echoReplyInput = replyBuilder.build();
             adapter.echoReply(echoReplyInput);
@@ -120,8 +121,8 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
         new Thread(() -> {
             LOGGER.debug("MockPlugin.onHelloMessage().run() Hello message received");
             HelloInputBuilder hib = new HelloInputBuilder();
-            hib.setVersion((short) 4);
-            hib.setXid(2L);
+            hib.setVersion(Uint8.valueOf(4));
+            hib.setXid(Uint32.TWO);
             HelloInput hi = hib.build();
             adapter.hello(hi);
             LOGGER.debug("hello msg sent");
@@ -132,8 +133,8 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
 
     protected void getSwitchFeatures() {
         GetFeaturesInputBuilder featuresBuilder = new GetFeaturesInputBuilder();
-        featuresBuilder.setVersion((short) 4);
-        featuresBuilder.setXid(3L);
+        featuresBuilder.setVersion(Uint8.valueOf(4));
+        featuresBuilder.setXid(Uint32.valueOf(3));
         GetFeaturesInput featuresInput = featuresBuilder.build();
         try {
             LOGGER.debug("Requesting features ");