X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Futil%2FMatchNormalizationUtilTest.java;h=f945d83ba81d4b141a0dd284a6b1a824a4d0a23b;hb=59bf5b768c4bcc0a7d25101e8b25d82e5af4be38;hp=4057c19cd6c3d5e56473a29c0ace1d7034b6dad1;hpb=c4239a5a5c82a971c2da8e16f393703cb175a9f4;p=openflowplugin.git

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java
index 4057c19cd6..f945d83ba8 100644
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.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.impl.util;
 
 import static org.junit.Assert.assertEquals;
@@ -37,6 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.TunnelIpv4Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.TunnelIpv4MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.opendaylight.ipv6.arbitrary.bitmask.fields.rev160224.Ipv6ArbitraryMask;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class MatchNormalizationUtilTest {
     @Test
@@ -44,7 +44,7 @@ public class MatchNormalizationUtilTest {
         final long port = 10;
 
         final MatchBuilder matchBuilder = MatchNormalizationUtil.normalizeInPortMatch(new MatchBuilder()
-                .setInPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF13_VERSION_ID);
+                .setInPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF_VERSION_1_3);
 
         assertEquals(String.valueOf(port), matchBuilder.getInPort().getValue());
     }
@@ -54,7 +54,7 @@ public class MatchNormalizationUtilTest {
         final long port = 10;
 
         final MatchBuilder matchBuilder = MatchNormalizationUtil.normalizeInPhyPortMatch(new MatchBuilder()
-                .setInPhyPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF13_VERSION_ID);
+                .setInPhyPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF_VERSION_1_3);
 
         assertEquals(String.valueOf(port), matchBuilder.getInPhyPort().getValue());
     }
@@ -70,7 +70,7 @@ public class MatchNormalizationUtilTest {
 
         final MatchBuilder matchBuilder = MatchNormalizationUtil.normalizeArpMatch(new MatchBuilder()
                 .setLayer3Match(new ArpMatchBuilder()
-                        .setArpOp(10)
+                        .setArpOp(Uint16.TEN)
                         .setArpSourceTransportAddress(new Ipv4Prefix(source))
                         .setArpTargetTransportAddress(new Ipv4Prefix(destination))
                         .setArpTargetHardwareAddress(new ArpTargetHardwareAddressBuilder()
@@ -83,7 +83,7 @@ public class MatchNormalizationUtilTest {
                                 .build())
                         .build()));
 
-        assertEquals(arpOp, ArpMatch.class.cast(matchBuilder.getLayer3Match()).getArpOp().intValue());
+        assertEquals(arpOp, ((ArpMatch) matchBuilder.getLayer3Match()).getArpOp().intValue());
     }
 
     @Test
@@ -97,8 +97,10 @@ public class MatchNormalizationUtilTest {
                         .setTunnelIpv4Destination(new Ipv4Prefix(destination))
                         .build()));
 
-        assertEquals("192.168.1.0/24", TunnelIpv4Match.class.cast(matchBuilder.getLayer3Match()).getTunnelIpv4Source().getValue());
-        assertEquals("192.168.2.0/24", TunnelIpv4Match.class.cast(matchBuilder.getLayer3Match()).getTunnelIpv4Destination().getValue());
+        assertEquals("192.168.1.0/24",
+                ((TunnelIpv4Match) matchBuilder.getLayer3Match()).getTunnelIpv4Source().getValue());
+        assertEquals("192.168.2.0/24",
+                ((TunnelIpv4Match) matchBuilder.getLayer3Match()).getTunnelIpv4Destination().getValue());
     }
 
     @Test
@@ -112,8 +114,9 @@ public class MatchNormalizationUtilTest {
                         .setIpv4Destination(new Ipv4Prefix(destination))
                         .build()));
 
-        assertEquals("192.168.1.0/24", Ipv4Match.class.cast(matchBuilder.getLayer3Match()).getIpv4Source().getValue());
-        assertEquals("192.168.2.0/24", Ipv4Match.class.cast(matchBuilder.getLayer3Match()).getIpv4Destination().getValue());
+        assertEquals("192.168.1.0/24", ((Ipv4Match) matchBuilder.getLayer3Match()).getIpv4Source().getValue());
+        assertEquals("192.168.2.0/24",
+                ((Ipv4Match) matchBuilder.getLayer3Match()).getIpv4Destination().getValue());
     }
 
     @Test
@@ -130,8 +133,8 @@ public class MatchNormalizationUtilTest {
                         .setIpv4DestinationArbitraryBitmask(leftMask)
                         .build()));
 
-        assertEquals(right, Ipv4Match.class.cast(matchBuilder.getLayer3Match()).getIpv4Source());
-        assertEquals(right, Ipv4Match.class.cast(matchBuilder.getLayer3Match()).getIpv4Destination());
+        assertEquals(right, ((Ipv4Match) matchBuilder.getLayer3Match()).getIpv4Source());
+        assertEquals(right, ((Ipv4Match) matchBuilder.getLayer3Match()).getIpv4Destination());
     }
 
     @Test
@@ -152,11 +155,11 @@ public class MatchNormalizationUtilTest {
                         .setIpv6Destination(leftPrefix)
                         .build()));
 
-        assertEquals(rightMac, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6NdSll());
-        assertEquals(rightMac, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6NdTll());
-        assertEquals(rightPrefix, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6Source());
-        assertEquals(rightPrefix, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6Destination());
-        assertEquals(rightAddress, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6NdTarget());
+        assertEquals(rightMac, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6NdSll());
+        assertEquals(rightMac, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6NdTll());
+        assertEquals(rightPrefix, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6Source());
+        assertEquals(rightPrefix, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6Destination());
+        assertEquals(rightAddress, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6NdTarget());
     }
 
     @Test
@@ -173,8 +176,8 @@ public class MatchNormalizationUtilTest {
                         .setIpv6DestinationArbitraryBitmask(leftMask)
                         .build()));
 
-        assertEquals(right, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6Source());
-        assertEquals(right, Ipv6Match.class.cast(matchBuilder.getLayer3Match()).getIpv6Destination());
+        assertEquals(right, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6Source());
+        assertEquals(right, ((Ipv6Match) matchBuilder.getLayer3Match()).getIpv6Destination());
     }
 
     @Test