BUG-730 : increasing branch coverage

Change-Id: I3ea5792ba36e73cefe38ae41ebcad21fe1f36fa1
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java
index c65495ff83ef7e6c281d3c8ce8d8e7e6ad177243..1177875fdad72d45e5aa9389282914a7359f0d22 100644 (file)
--- a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java
+++ b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java
@@ -11,9 +11,9 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
@@ -25,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
+import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 public class NextHopUtilTest {
 
@@ -54,6 +55,16 @@ public class NextHopUtilTest {
         NextHopUtil.serializeNextHop(hop, buffer);
         assertArrayEquals(ipv6lB, ByteArray.readAllBytes(buffer));
 
+        buffer.clear();
+        NextHopUtil.serializeNextHop(new CNextHop() {
+
+            @Override
+            public Class<? extends DataContainer> getImplementedInterface() {
+                return null;
+            }
+        }, buffer);
+        assertEquals(0, buffer.readableBytes());
+
         hop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder().setLinkLocal(ipv6l).build()).build();
         buffer.clear();
         try {

diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ActivatorTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ActivatorTest.java
index 843451a8fe6128660f3e4e898945084877ff0444..d7eb58459b329f923c4dec00868daebd84bcaf96 100644 (file)
--- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ActivatorTest.java
+++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ActivatorTest.java
@@ -23,7 +23,7 @@ public class ActivatorTest {
 
     @Test
     public void testActivator() throws Exception {
-        final BGPActivator act = new BGPActivator(true);
+        final BGPActivator act = new BGPActivator();
         final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();
 
         assertNull(context.getAddressFamilyRegistry().classForFamily(16388));

diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java
index 47eea199dd5b1f163e319ac293ceacfffee4c477..6f150ae50f554a81bc13cbbb08ed3a8db4a62d02 100644 (file)
--- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java
+++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java
@@ -185,6 +185,10 @@ public class LinkstateAdjRIBsInTest extends AbstractDataBrokerTest {
 
     @Test
     public void testAddNode() {
+        this.builder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
+            new DestinationLinkstateCaseBuilder().build()).build());
+        this.lrib.addRoutes(this.adjRibTx, this.peer, this.builder.build(), null);
+
         this.dBuilder.setNlriType(NlriType.Node);
         this.dBuilder.setRemoteNodeDescriptors(new RemoteNodeDescriptorsBuilder().setCRouterIdentifier(
             new IsisPseudonodeCaseBuilder().setIsisPseudonode(
@@ -196,7 +200,6 @@ public class LinkstateAdjRIBsInTest extends AbstractDataBrokerTest {
                 new DestinationLinkstateBuilder().setCLinkstateDestination(this.destinations).build()).build()).build());
 
         final PathAttributesBuilder pa = new PathAttributesBuilder();
-        pa.setOrigin(new OriginBuilder().setValue(BgpOrigin.Egp).build());
 
         this.lrib.addRoutes(this.adjRibTx, this.peer, this.builder.build(), pa.build());
 

diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
index ab14e23e222f1fd78412ff849878af67dddac6cd..f19b3aed90d7ff56e6684be5411826b1b8f5f3af 100644 (file)
--- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
+++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
@@ -36,7 +36,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.update.path.attributes.mp.reach.nlri.advertized.routes.destination.type.destination.linkstate._case.DestinationLinkstateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.update.PathAttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.PathAttributes2Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.destination.destination.type.DestinationIpv4CaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.destination.destination.type.DestinationIpv6CaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.path.attributes.MpReachNlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.path.attributes.MpUnreachNlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.path.attributes.mp.reach.nlri.AdvertizedRoutesBuilder;
@@ -87,6 +90,38 @@ public class LinkstateAttributeParserTest {
                                 Lists.newArrayList(new CLinkstateDestinationBuilder().setNlriType(type).build())).build()).build()).build()).build()).build());
     }
 
+    @Test
+    public void testGetNlriType() throws BGPParsingException {
+        final ByteBuf b = Unpooled.buffer();
+        PathAttributesBuilder builder = new PathAttributesBuilder();
+        this.parser.parseAttribute(b, builder);
+        assertEquals(0, b.readableBytes());
+        builder = new PathAttributesBuilder();
+
+        final PathAttributes1Builder builder1 = new PathAttributes1Builder();
+        builder.addAugmentation(PathAttributes1.class, builder1.build());
+        this.parser.parseAttribute(b, builder);
+        assertEquals(0, b.readableBytes());
+        builder = new PathAttributesBuilder();
+
+        builder.addAugmentation(PathAttributes1.class, builder1.setMpReachNlri(
+            new MpReachNlriBuilder().setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(new DestinationIpv4CaseBuilder().build()).build()).build()).build());
+        this.parser.parseAttribute(b, builder);
+        assertEquals(0, b.readableBytes());
+        builder = new PathAttributesBuilder();
+
+        final PathAttributes2Builder builder2 = new PathAttributes2Builder();
+        builder.addAugmentation(PathAttributes2.class, builder2.build());
+        this.parser.parseAttribute(b, builder);
+        assertEquals(0, b.readableBytes());
+        builder = new PathAttributesBuilder();
+
+        builder.addAugmentation(PathAttributes2.class, builder2.setMpUnreachNlri(
+            new MpUnreachNlriBuilder().setWithdrawnRoutes(new WithdrawnRoutesBuilder().setDestinationType(new DestinationIpv6CaseBuilder().build()).build()).build()).build());
+        this.parser.parseAttribute(b, builder);
+        assertEquals(0, b.readableBytes());
+    }
+
     @Test
     public void testPositiveLinks() throws BGPParsingException {
         final PathAttributesBuilder builder = createBuilder(NlriType.Link);