From: Miroslav Toth <mirtoth@cisco.com>
Date: Thu, 2 Jun 2016 09:28:18 +0000 (+0200)
Subject: JUnit Test - MapRequestUtilTest update
X-Git-Tag: release/boron~84
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=07ac8e5b366370cae083db323714c7e31763e2b4;p=lispflowmapping.git

JUnit Test - MapRequestUtilTest update

Change-Id: I6dac4d23d943052fcc1133474cf9d999c6d18fba
Signed-off-by: Miroslav Toth <mirtoth@cisco.com>
---

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java
index 3b324656c..57bf9ea13 100644
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java
@@ -8,16 +8,20 @@
 package org.opendaylight.lispflowmapping.lisp.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import com.google.common.collect.Lists;
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
         .address.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
+        .address.Ipv4PrefixBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
         .address.Ipv6Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
@@ -35,7 +39,7 @@ public class MapRequestUtilTest {
 
     private static final String IPV4_STRING = "192.168.0.1";
     private static final String IPV6_STRING = "1111:2222:3333:4444:5555:6666:7777:8888";
-
+    private static final String MASK = "/24";
     private static final byte[] IPV4_BYTES = new byte[]{-64, -88, 0, 1};
     private static final byte[] IPV6_BYTES =
             new byte[]{17, 17, 34, 34, 51, 51, 68, 68, 85, 85, 102, 102, 119, 119, -120, -120};
@@ -46,6 +50,8 @@ public class MapRequestUtilTest {
             .setIpv4Binary(new Ipv4AddressBinary(IPV4_BYTES)).build();
     private static final Address IPV6_ADDRESS_BINARY = new Ipv6BinaryBuilder()
             .setIpv6Binary(new Ipv6AddressBinary(IPV6_BYTES)).build();
+    private static final Address IPV4_ADDRESS_PREFIX = new Ipv4PrefixBuilder()
+            .setIpv4Prefix(new Ipv4Prefix(IPV4_STRING + MASK)).build();
 
     /**
      * Tests {@link MapRequestUtil#selectItrRloc} method with Ipv4.
@@ -112,4 +118,25 @@ public class MapRequestUtilTest {
         InetAddress result = MapRequestUtil.selectItrRloc(request);
         assertEquals(expectedResult, result);
     }
+
+    /**
+     * Tests {@link MapRequestUtil#selectItrRloc} method with Ipv4Prefix.
+     */
+    @Test
+    public void selectItrRlocTest_Ipv4Prefix() {
+        final ItrRlocBuilder itrRloc = new ItrRlocBuilder()
+                .setRloc(new RlocBuilder().setAddress(IPV4_ADDRESS_PREFIX).build());
+        final MapRequest request = new MapRequestBuilder().setItrRloc(Lists.newArrayList(itrRloc.build())).build();
+
+        assertNull(MapRequestUtil.selectItrRloc(request));
+    }
+
+    /**
+     * Tests {@link MapRequestUtil#selectItrRloc} method with no ItrRlocs.
+     */
+    @Test
+    public void selectItrRlocTest_noItrRlocs() {
+        final MapRequest request = new MapRequestBuilder().build();
+        assertNull(MapRequestUtil.selectItrRloc(request));
+    }
 }