Migrate boolean getters

[bgpcep.git] / bgp / parser-impl / src / test / java / org / opendaylight / protocol / bgp / parser / impl / GracefulCapabilityHandlerTest.java

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java
index f2acd25c12eca69b2100964845790123dceff810..73f2af147a2fdba19b85c33c59ab3a92d2b2c62d 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java
@@ -5,14 +5,14 @@
  * 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.protocol.bgp.parser.impl;
 
-import com.google.common.collect.Lists;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.Collections;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
@@ -21,7 +21,6 @@ import org.opendaylight.protocol.bgp.parser.impl.message.open.GracefulCapability
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapability.RestartFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapabilityBuilder;
@@ -31,6 +30,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.rev200120.Ipv4AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class GracefulCapabilityHandlerTest {
@@ -59,16 +59,17 @@ public class GracefulCapabilityHandlerTest {
                 .setAfiFlags(new AfiFlags(true))
                 .setAfi(Ipv4AddressFamily.class)
                 .setSafi(UnicastSubsequentAddressFamily.class);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer(capaBytes.length);
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
-        Assert.assertArrayEquals(capaBytes, buffer.array());
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
+        assertArrayEquals(capaBytes, buffer.array());
 
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes).slice(2, capaBytes.length - 2)));
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes).slice(2, capaBytes.length - 2)));
 
         final byte[] capaBytes2 = {
             (byte) 0x40, (byte) 0x06, (byte) 0x00, (byte) 0x00,
@@ -77,23 +78,25 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setRestartFlags(new RestartFlags(false));
         capaBuilder.setRestartTime(Uint16.ZERO);
         tablesBuilder.setAfiFlags(new AfiFlags(false));
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
         buffer.clear();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
-        Assert.assertArrayEquals(capaBytes2, buffer.array());
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes2).slice(2, capaBytes2.length - 2)));
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
+        assertArrayEquals(capaBytes2, buffer.array());
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes2).slice(2, capaBytes2.length - 2)));
 
         capaBuilder.setRestartFlags(null);
         tablesBuilder.setAfiFlags(null);
         capaBuilder.setRestartTime((Uint16) null);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
         buffer.clear();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
-        Assert.assertArrayEquals(capaBytes2, buffer.array());
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
+        assertArrayEquals(capaBytes2, buffer.array());
 
         final byte[] capaBytes3 = {
             (byte) 0x40, (byte) 0x06, (byte) 0x00, (byte) 0x00,
@@ -101,32 +104,37 @@ public class GracefulCapabilityHandlerTest {
         };
         capaBuilder.setRestartFlags(new RestartFlags(false));
         capaBuilder.setRestartTime(Uint16.ZERO);
-        capaBuilder.setTables(Collections.emptyList());
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes3).slice(2, capaBytes3.length - 2)));
+        capaBuilder.setTables(Collections.emptyMap());
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes3).slice(2, capaBytes3.length - 2)));
 
         final byte[] capaBytes4 = {
             (byte) 0x40, (byte) 0x06, (byte) 0x00, (byte) 0x00,
             (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00
         };
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes4).slice(2, capaBytes4.length - 2)));
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes4).slice(2, capaBytes4.length - 2)));
         final byte[] capaBytes5 = {
             (byte) 0x40, (byte) 0x02, (byte) 0x00, (byte) 0x00
         };
         final ByteBuf b = Unpooled.buffer(capaBytes5.length);
 
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().build())
-            .build()).build(), b);
-        Assert.assertArrayEquals(capaBytes5, b.array());
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder()
-            .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
-                .setRestartFlags(new RestartFlags(Boolean.FALSE))
-                .setRestartTime(Uint16.ZERO).setTables(Collections.emptyList()).build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes5).slice(2, capaBytes5.length - 2)));
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder()
+                .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().build())
+                .build())
+            .build(), b);
+        assertArrayEquals(capaBytes5, b.array());
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder()
+                .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
+                    .setRestartFlags(new RestartFlags(Boolean.FALSE))
+                    .setRestartTime(Uint16.ZERO)
+                    .build())
+                .build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes5).slice(2, capaBytes5.length - 2)));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -142,11 +150,12 @@ public class GracefulCapabilityHandlerTest {
 
         tablesBuilder.setAfi(AddressFamily.class);
         tablesBuilder.setSafi(UnicastSubsequentAddressFamily.class);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -161,11 +170,12 @@ public class GracefulCapabilityHandlerTest {
         tablesBuilder.setAfiFlags(new AfiFlags(true));
         tablesBuilder.setAfi(Ipv4AddressFamily.class);
         tablesBuilder.setSafi(SubsequentAddressFamily.class);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -177,7 +187,7 @@ public class GracefulCapabilityHandlerTest {
                 .setRestartFlags(new RestartFlags(true))
                 // FIXME: this is throwing IAE, why is the rest of the test even here?
                 .setRestartTime(Uint16.MAX_VALUE)
-                .setTables(Lists.newArrayList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                     .setAfiFlags(new AfiFlags(true))
                     .setAfi(Ipv4AddressFamily.class)
                     .setSafi(UnicastSubsequentAddressFamily.class)
@@ -185,8 +195,8 @@ public class GracefulCapabilityHandlerTest {
 
         final ByteBuf buffer = Unpooled.buffer();
         handler.serializeCapability(new CParametersBuilder()
-            .addAugmentation(CParameters1.class, new CParameters1Builder()
-                .setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -198,7 +208,7 @@ public class GracefulCapabilityHandlerTest {
                 .setRestartFlags(new RestartFlags(true))
                 .setRestartTime(Uint16.valueOf(50000));
 
-        capaBuilder.setTables(Lists.newArrayList(new TablesBuilder()
+        capaBuilder.setTables(BindingMap.of(new TablesBuilder()
             .setAfiFlags(new AfiFlags(true))
             .setAfi(Ipv4AddressFamily.class)
             .setSafi(UnicastSubsequentAddressFamily.class)
@@ -206,7 +216,7 @@ public class GracefulCapabilityHandlerTest {
 
         final ByteBuf buffer = Unpooled.buffer();
         handler.serializeCapability(new CParametersBuilder()
-            .addAugmentation(CParameters1.class, new CParameters1Builder()
-                .setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 }